rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove hack, fix fmt and tests

Browse Source
This commit is contained in:
Esteban Kuber
2022-03-27 02:14:54 +00:00
parent a6301cab5e
commit e1ef833bca
9 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
View File

@@ -1756,7 +1756,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> {
trait_ref: ty::PolyTraitRef<'tcx>, trait_ref: ty::PolyTraitRef<'tcx>,
err: &mut Diagnostic, err: &mut Diagnostic,
) -> bool { ) -> bool {
let report = |mut candidates: Vec<TraitRef<'_>>, err: &mut Diagnostic| { let report = |mut candidates: Vec<TraitRef<'tcx>>, err: &mut Diagnostic| {
candidates.sort(); candidates.sort();
candidates.dedup(); candidates.dedup();
let len = candidates.len(); let len = candidates.len();
@@ -1778,11 +1778,8 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> {
} }
let trait_ref = TraitRef::identity(self.tcx, candidates[0].def_id); let trait_ref = TraitRef::identity(self.tcx, candidates[0].def_id);
// Check if the trait is the same in all cases. If so, we'll only show the type. // Check if the trait is the same in all cases. If so, we'll only show the type.
// FIXME: there *has* to be a better way! let mut traits: Vec<_> =
let mut traits: Vec<_> = candidates candidates.iter().map(|c| c.print_only_trait_path().to_string()).collect();
.iter()
.map(|c| format!("{}", c).split(" as ").last().unwrap().to_string())
.collect();
traits.sort(); traits.sort();
traits.dedup(); traits.dedup();

6
src/test/ui/const-generics/defaults/rp_impl_trait_fail.stderr
View File

@@ -40,7 +40,7 @@ LL | | 1_u32
LL | | } LL | | }
| |_^ the trait `Traitor<N, N>` is not implemented for `u32` | |_^ the trait `Traitor<N, N>` is not implemented for `u32`
| |
= help: the following implementations were found: = help: the following other types implement trait `Traitor<N, M>`:
<u32 as Traitor<N, 2_u8>> <u32 as Traitor<N, 2_u8>>
<u64 as Traitor<1_u8, 2_u8>> <u64 as Traitor<1_u8, 2_u8>>
@@ -65,9 +65,9 @@ LL | | 1_u64
LL | | } LL | | }
| |_^ the trait `Traitor<1_u8, 1_u8>` is not implemented for `u64` | |_^ the trait `Traitor<1_u8, 1_u8>` is not implemented for `u64`
| |
= help: the following implementations were found: = help: the following other types implement trait `Traitor<N, M>`:
<u64 as Traitor<1_u8, 2_u8>>
<u32 as Traitor<N, 2_u8>> <u32 as Traitor<N, 2_u8>>
<u64 as Traitor<1_u8, 2_u8>>
error: aborting due to 6 previous errors error: aborting due to 6 previous errors

2
src/test/ui/kindck/kindck-impl-type-params.nll.stderr
View File

@@ -72,6 +72,7 @@ error[E0277]: the trait bound `String: Copy` is not satisfied
LL | let a = t as Box<dyn Gettable<String>>; LL | let a = t as Box<dyn Gettable<String>>;
| ^ the trait `Copy` is not implemented for `String` | ^ the trait `Copy` is not implemented for `String`
| |
= help: the trait `Gettable<T>` is implemented for `S<T>`
note: required because of the requirements on the impl of `Gettable<String>` for `S<String>` note: required because of the requirements on the impl of `Gettable<String>` for `S<String>`
--> $DIR/kindck-impl-type-params.rs:14:32 --> $DIR/kindck-impl-type-params.rs:14:32
| |
@@ -85,6 +86,7 @@ error[E0277]: the trait bound `Foo: Copy` is not satisfied
LL | let a: Box<dyn Gettable<Foo>> = t; LL | let a: Box<dyn Gettable<Foo>> = t;
| ^ the trait `Copy` is not implemented for `Foo` | ^ the trait `Copy` is not implemented for `Foo`
| |
= help: the trait `Gettable<T>` is implemented for `S<T>`
note: required because of the requirements on the impl of `Gettable<Foo>` for `S<Foo>` note: required because of the requirements on the impl of `Gettable<Foo>` for `S<Foo>`
--> $DIR/kindck-impl-type-params.rs:14:32 --> $DIR/kindck-impl-type-params.rs:14:32
| |

1
src/test/ui/traits/suggest-deferences/root-obligation.fixed
View File

@@ -11,4 +11,3 @@ fn get_vowel_count(string: &str) -> usize {
fn main() { fn main() {
let _ = get_vowel_count("asdf"); let _ = get_vowel_count("asdf");
} }

1
src/test/ui/traits/suggest-deferences/root-obligation.rs
View File

@@ -11,4 +11,3 @@ fn get_vowel_count(string: &str) -> usize {
fn main() { fn main() {
let _ = get_vowel_count("asdf"); let _ = get_vowel_count("asdf");
} }

2
src/test/ui/type-alias-impl-trait/nested-tait-inference2.stderr
View File

@@ -19,7 +19,7 @@ LL | | ()
LL | | } LL | | }
| |_^ the trait `Foo<FooX>` is not implemented for `()` | |_^ the trait `Foo<FooX>` is not implemented for `()`
| |
= help: the following implementations were found: = help: the following other types implement trait `Foo<A>`:
<() as Foo<()>> <() as Foo<()>>
<() as Foo<u32>> <() as Foo<u32>>

14
src/test/ui/type-alias-impl-trait/self-referential-2.stderr
View File

@@ -5,11 +5,15 @@ LL | 42_i32
| ^^^^^^ no implementation for `i32 == Foo` | ^^^^^^ no implementation for `i32 == Foo`
| |
= help: the trait `PartialEq<Foo>` is not implemented for `i32` = help: the trait `PartialEq<Foo>` is not implemented for `i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error: aborting due to previous error error: aborting due to previous error

42
src/test/ui/type-alias-impl-trait/self-referential-4.stderr
View File

@@ -5,11 +5,15 @@ LL | i
| ^ no implementation for `&i32 == Bar<'b, 'static>` | ^ no implementation for `&i32 == Bar<'b, 'static>`
| |
= help: the trait `PartialEq<Bar<'b, 'static>>` is not implemented for `&i32` = help: the trait `PartialEq<Bar<'b, 'static>>` is not implemented for `&i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error[E0277]: can't compare `&i32` with `Foo<'static, 'b>` error[E0277]: can't compare `&i32` with `Foo<'static, 'b>`
@@ -19,11 +23,15 @@ LL | i
| ^ no implementation for `&i32 == Foo<'static, 'b>` | ^ no implementation for `&i32 == Foo<'static, 'b>`
| |
= help: the trait `PartialEq<Foo<'static, 'b>>` is not implemented for `&i32` = help: the trait `PartialEq<Foo<'static, 'b>>` is not implemented for `&i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error[E0277]: can't compare `&i32` with `Moo<'static, 'a>` error[E0277]: can't compare `&i32` with `Moo<'static, 'a>`
@@ -33,11 +41,15 @@ LL | i
| ^ no implementation for `&i32 == Moo<'static, 'a>` | ^ no implementation for `&i32 == Moo<'static, 'a>`
| |
= help: the trait `PartialEq<Moo<'static, 'a>>` is not implemented for `&i32` = help: the trait `PartialEq<Moo<'static, 'a>>` is not implemented for `&i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

42
src/test/ui/type-alias-impl-trait/self-referential.stderr
View File

@@ -5,11 +5,15 @@ LL | i
| ^ no implementation for `&i32 == Bar<'b, 'a>` | ^ no implementation for `&i32 == Bar<'b, 'a>`
| |
= help: the trait `PartialEq<Bar<'b, 'a>>` is not implemented for `&i32` = help: the trait `PartialEq<Bar<'b, 'a>>` is not implemented for `&i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error[E0277]: can't compare `&i32` with `(i32, &i32)` error[E0277]: can't compare `&i32` with `(i32, &i32)`
@@ -19,11 +23,15 @@ LL | (42, i)
| ^ no implementation for `&i32 == (i32, &i32)` | ^ no implementation for `&i32 == (i32, &i32)`
| |
= help: the trait `PartialEq<(i32, &i32)>` is not implemented for `&i32` = help: the trait `PartialEq<(i32, &i32)>` is not implemented for `&i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error[E0277]: can't compare `&i32` with `(i32, Moo<'b, 'a>::{opaque#0})` error[E0277]: can't compare `&i32` with `(i32, Moo<'b, 'a>::{opaque#0})`
@@ -33,11 +41,15 @@ LL | (42, i)
| ^ no implementation for `&i32 == (i32, Moo<'b, 'a>::{opaque#0})` | ^ no implementation for `&i32 == (i32, Moo<'b, 'a>::{opaque#0})`
| |
= help: the trait `PartialEq<(i32, Moo<'b, 'a>::{opaque#0})>` is not implemented for `&i32` = help: the trait `PartialEq<(i32, Moo<'b, 'a>::{opaque#0})>` is not implemented for `&i32`
= help: the following implementations were found: = help: the following other types implement trait `PartialEq<Rhs>`:
<i32 as PartialEq> f32
<f32 as PartialEq> f64
<f64 as PartialEq> i128
<i128 as PartialEq> i16
i32
i64
i8
isize
and 6 others and 6 others
error: aborting due to 3 previous errors error: aborting due to 3 previous errors