Skip to content

Commit 48a0d03

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #113005 - compiler-errors:dont-query-normalize, r=cjgillot
Don't call `query_normalize` when reporting similar impls Firstly, It's sketchy to be using `query_normalize` at all during HIR typeck -- it's asking for an ICE 😅. Secondly, we're normalizing an impl trait ref that potentially has parameter types in `ty::ParamEnv::empty()`, which is kinda sketchy as well. The only UI test change from removing this normalization is that we don't evaluate anonymous constants in impls, which end up giving us really ugly suggestions: ``` error[E0277]: the trait bound `[X; 35]: Default` is not satisfied --> /home/gh-compiler-errors/test.rs:4:5 | 4 | <[X; 35] as Default>::default(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Default` is not implemented for `[X; 35]` | = help: the following other types implement trait `Default`: &[T] &mut [T] [T; 32] [T; core::::array::{impl#30}::{constant#0}] [T; core::::array::{impl#31}::{constant#0}] [T; core::::array::{impl#32}::{constant#0}] [T; core::::array::{impl#33}::{constant#0}] [T; core::::array::{impl#34}::{constant#0}] and 27 others ``` So just fold the impls with a `BottomUpFolder` that calls `ty::Const::eval`. This doesn't work totally correctly with generic-const-exprs, but it's fine for stable code, and this is error reporting after all.
2 parents 4353b1e + 2c33dfe commit 48a0d03

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+299
-268
lines changed

‎compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs

+34-32
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
1212
use crate::infer::{self, InferCtxt};
1313
use crate::solve::{GenerateProofTree, InferCtxtEvalExt, UseGlobalCache};
1414
use crate::traits::query::evaluate_obligation::InferCtxtExt as _;
15-
use crate::traits::query::normalize::QueryNormalizeExt as _;
1615
use crate::traits::specialize::to_pretty_impl_header;
1716
use crate::traits::NormalizeExt;
1817
use on_unimplemented::{AppendConstMessage, OnUnimplementedNote, TypeErrCtxtExt as _};
@@ -33,7 +32,7 @@ use rustc_middle::traits::solve::Goal;
3332
use rustc_middle::traits::{DefiningAnchor, SelectionOutputTypeParameterMismatch};
3433
use rustc_middle::ty::abstract_const::NotConstEvaluatable;
3534
use rustc_middle::ty::error::{ExpectedFound, TypeError};
36-
use rustc_middle::ty::fold::{TypeFolder, TypeSuperFoldable};
35+
use rustc_middle::ty::fold::{BottomUpFolder, TypeFolder, TypeSuperFoldable};
3736
use rustc_middle::ty::print::{with_forced_trimmed_paths, FmtPrinter, Print};
3837
use rustc_middle::ty::{
3938
self, SubtypePredicate, ToPolyTraitRef, ToPredicate, TraitRef, Ty, TyCtxt, TypeFoldable,
@@ -63,7 +62,7 @@ pub enum CandidateSimilarity {
6362
Fuzzy { ignoring_lifetimes: bool },
6463
}
6564

66-
#[derive(Debug, Clone, Copy)]
65+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
6766
pub struct ImplCandidate<'tcx> {
6867
pub trait_ref: ty::TraitRef<'tcx>,
6968
pub similarity: CandidateSimilarity,
@@ -1941,10 +1940,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
19411940
other: bool,
19421941
) -> bool {
19431942
let other = if other { "other " } else { "" };
1944-
let report = |mut candidates: Vec<TraitRef<'tcx>>, err: &mut Diagnostic| {
1945-
candidates.sort();
1946-
candidates.dedup();
1947-
let len = candidates.len();
1943+
let report = |candidates: Vec<TraitRef<'tcx>>, err: &mut Diagnostic| {
19481944
if candidates.is_empty() {
19491945
return false;
19501946
}
@@ -1973,26 +1969,31 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
19731969
candidates.iter().map(|c| c.print_only_trait_path().to_string()).collect();
19741970
traits.sort();
19751971
traits.dedup();
1972+
// FIXME: this could use a better heuristic, like just checking
1973+
// that substs[1..] is the same.
1974+
let all_traits_equal = traits.len() == 1;
19761975

1977-
let mut candidates: Vec<String> = candidates
1976+
let candidates: Vec<String> = candidates
19781977
.into_iter()
19791978
.map(|c| {
1980-
if traits.len() == 1 {
1979+
if all_traits_equal {
19811980
format!("\n {}", c.self_ty())
19821981
} else {
19831982
format!("\n {}", c)
19841983
}
19851984
})
19861985
.collect();
19871986

1988-
candidates.sort();
1989-
candidates.dedup();
19901987
let end = if candidates.len() <= 9 { candidates.len() } else { 8 };
19911988
err.help(format!(
19921989
"the following {other}types implement trait `{}`:{}{}",
19931990
trait_ref.print_only_trait_path(),
19941991
candidates[..end].join(""),
1995-
if len > 9 { format!("\nand {} others", len - 8) } else { String::new() }
1992+
if candidates.len() > 9 {
1993+
format!("\nand {} others", candidates.len() - 8)
1994+
} else {
1995+
String::new()
1996+
}
19961997
));
19971998
true
19981999
};
@@ -2006,7 +2007,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
20062007
// Mentioning implementers of `Copy`, `Debug` and friends is not useful.
20072008
return false;
20082009
}
2009-
let normalized_impl_candidates: Vec<_> = self
2010+
let mut impl_candidates: Vec<_> = self
20102011
.tcx
20112012
.all_impls(def_id)
20122013
// Ignore automatically derived impls and `!Trait` impls.
@@ -2033,7 +2034,10 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
20332034
}
20342035
})
20352036
.collect();
2036-
return report(normalized_impl_candidates, err);
2037+
2038+
impl_candidates.sort();
2039+
impl_candidates.dedup();
2040+
return report(impl_candidates, err);
20372041
}
20382042

20392043
// Sort impl candidates so that ordering is consistent for UI tests.
@@ -2042,27 +2046,25 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
20422046
//
20432047
// Prefer more similar candidates first, then sort lexicographically
20442048
// by their normalized string representation.
2045-
let mut normalized_impl_candidates_and_similarities = impl_candidates
2049+
let mut impl_candidates: Vec<_> = impl_candidates
20462050
.iter()
2047-
.copied()
2048-
.map(|ImplCandidate { trait_ref, similarity }| {
2049-
// FIXME(compiler-errors): This should be using `NormalizeExt::normalize`
2050-
let normalized = self
2051-
.at(&ObligationCause::dummy(), ty::ParamEnv::empty())
2052-
.query_normalize(trait_ref)
2053-
.map_or(trait_ref, |normalized| normalized.value);
2054-
(similarity, normalized)
2051+
.cloned()
2052+
.map(|mut cand| {
2053+
// Fold the consts so that they shows up as, e.g., `10`
2054+
// instead of `core::::array::{impl#30}::{constant#0}`.
2055+
cand.trait_ref = cand.trait_ref.fold_with(&mut BottomUpFolder {
2056+
tcx: self.tcx,
2057+
ty_op: |ty| ty,
2058+
lt_op: |lt| lt,
2059+
ct_op: |ct| ct.eval(self.tcx, ty::ParamEnv::empty()),
2060+
});
2061+
cand
20552062
})
2056-
.collect::<Vec<_>>();
2057-
normalized_impl_candidates_and_similarities.sort();
2058-
normalized_impl_candidates_and_similarities.dedup();
2059-
2060-
let normalized_impl_candidates = normalized_impl_candidates_and_similarities
2061-
.into_iter()
2062-
.map(|(_, normalized)| normalized)
2063-
.collect::<Vec<_>>();
2063+
.collect();
2064+
impl_candidates.sort_by_key(|cand| (cand.similarity, cand.trait_ref));
2065+
impl_candidates.dedup();
20642066

2065-
report(normalized_impl_candidates, err)
2067+
report(impl_candidates.into_iter().map(|cand| cand.trait_ref).collect(), err)
20662068
}
20672069

20682070
fn report_similar_impl_candidates_for_root_obligation(

‎tests/ui/binop/binop-mul-i32-f32.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ LL | x * y
66
|
77
= help: the trait `Mul<f32>` is not implemented for `i32`
88
= help: the following other types implement trait `Mul<Rhs>`:
9+
<i32 as Mul>
10+
<i32 as Mul<&i32>>
911
<&'a i32 as Mul<i32>>
1012
<&i32 as Mul<&i32>>
11-
<i32 as Mul<&i32>>
12-
<i32 as Mul>
1313

1414
error: aborting due to previous error
1515

‎tests/ui/binop/shift-various-bad-types.stderr

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ LL | 22 >> p.char;
66
|
77
= help: the trait `Shr<char>` is not implemented for `{integer}`
88
= help: the following other types implement trait `Shr<Rhs>`:
9-
<&'a i128 as Shr<i128>>
10-
<&'a i128 as Shr<i16>>
11-
<&'a i128 as Shr<i32>>
12-
<&'a i128 as Shr<i64>>
13-
<&'a i128 as Shr<i8>>
14-
<&'a i128 as Shr<isize>>
15-
<&'a i128 as Shr<u128>>
16-
<&'a i128 as Shr<u16>>
9+
<isize as Shr>
10+
<isize as Shr<i8>>
11+
<isize as Shr<i16>>
12+
<isize as Shr<i32>>
13+
<isize as Shr<i64>>
14+
<isize as Shr<i128>>
15+
<isize as Shr<usize>>
16+
<isize as Shr<u8>>
1717
and 568 others
1818

1919
error[E0277]: no implementation for `{integer} >> &str`
@@ -24,14 +24,14 @@ LL | 22 >> p.str;
2424
|
2525
= help: the trait `Shr<&str>` is not implemented for `{integer}`
2626
= help: the following other types implement trait `Shr<Rhs>`:
27-
<&'a i128 as Shr<i128>>
28-
<&'a i128 as Shr<i16>>
29-
<&'a i128 as Shr<i32>>
30-
<&'a i128 as Shr<i64>>
31-
<&'a i128 as Shr<i8>>
32-
<&'a i128 as Shr<isize>>
33-
<&'a i128 as Shr<u128>>
34-
<&'a i128 as Shr<u16>>
27+
<isize as Shr>
28+
<isize as Shr<i8>>
29+
<isize as Shr<i16>>
30+
<isize as Shr<i32>>
31+
<isize as Shr<i64>>
32+
<isize as Shr<i128>>
33+
<isize as Shr<usize>>
34+
<isize as Shr<u8>>
3535
and 568 others
3636

3737
error[E0277]: no implementation for `{integer} >> &Panolpy`
@@ -42,14 +42,14 @@ LL | 22 >> p;
4242
|
4343
= help: the trait `Shr<&Panolpy>` is not implemented for `{integer}`
4444
= help: the following other types implement trait `Shr<Rhs>`:
45-
<&'a i128 as Shr<i128>>
46-
<&'a i128 as Shr<i16>>
47-
<&'a i128 as Shr<i32>>
48-
<&'a i128 as Shr<i64>>
49-
<&'a i128 as Shr<i8>>
50-
<&'a i128 as Shr<isize>>
51-
<&'a i128 as Shr<u128>>
52-
<&'a i128 as Shr<u16>>
45+
<isize as Shr>
46+
<isize as Shr<i8>>
47+
<isize as Shr<i16>>
48+
<isize as Shr<i32>>
49+
<isize as Shr<i64>>
50+
<isize as Shr<i128>>
51+
<isize as Shr<usize>>
52+
<isize as Shr<u8>>
5353
and 568 others
5454

5555
error[E0308]: mismatched types

‎tests/ui/const-generics/exhaustive-value.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ LL | <() as Foo<N>>::test()
66
|
77
= help: the following other types implement trait `Foo<N>`:
88
<() as Foo<0>>
9-
<() as Foo<100>>
10-
<() as Foo<101>>
11-
<() as Foo<102>>
12-
<() as Foo<103>>
13-
<() as Foo<104>>
14-
<() as Foo<105>>
15-
<() as Foo<106>>
9+
<() as Foo<1>>
10+
<() as Foo<2>>
11+
<() as Foo<3>>
12+
<() as Foo<4>>
13+
<() as Foo<5>>
14+
<() as Foo<6>>
15+
<() as Foo<7>>
1616
and 248 others
1717

1818
error: aborting due to previous error

‎tests/ui/const-generics/generic_arg_infer/issue-91614.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ LL | let y = Mask::<_, _>::splat(false);
66
|
77
= note: cannot satisfy `_: MaskElement`
88
= help: the following types implement trait `MaskElement`:
9+
isize
10+
i8
911
i16
1012
i32
1113
i64
12-
i8
13-
isize
1414
note: required by a bound in `Mask::<T, LANES>::splat`
1515
--> $SRC_DIR/core/src/../../portable-simd/crates/core_simd/src/masks.rs:LL:COL
1616
help: consider giving `y` an explicit type, where the type for type parameter `T` is specified

‎tests/ui/const-generics/issues/issue-67185-2.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ LL | <u8 as Baz>::Quaks: Bar,
55
| ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` is not implemented for `[u16; 3]`
66
|
77
= help: the following other types implement trait `Bar`:
8-
[[u16; 3]; 3]
98
[u16; 4]
9+
[[u16; 3]; 3]
1010
= help: see issue #48214
1111
= help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
1212

@@ -17,8 +17,8 @@ LL | [<u8 as Baz>::Quaks; 2]: Bar,
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` is not implemented for `[[u16; 3]; 2]`
1818
|
1919
= help: the following other types implement trait `Bar`:
20-
[[u16; 3]; 3]
2120
[u16; 4]
21+
[[u16; 3]; 3]
2222
= help: see issue #48214
2323
= help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
2424

@@ -29,8 +29,8 @@ LL | impl Foo for FooImpl {}
2929
| ^^^ the trait `Bar` is not implemented for `[u16; 3]`
3030
|
3131
= help: the following other types implement trait `Bar`:
32-
[[u16; 3]; 3]
3332
[u16; 4]
33+
[[u16; 3]; 3]
3434
note: required by a bound in `Foo`
3535
--> $DIR/issue-67185-2.rs:15:25
3636
|
@@ -47,8 +47,8 @@ LL | impl Foo for FooImpl {}
4747
| ^^^ the trait `Bar` is not implemented for `[[u16; 3]; 2]`
4848
|
4949
= help: the following other types implement trait `Bar`:
50-
[[u16; 3]; 3]
5150
[u16; 4]
51+
[[u16; 3]; 3]
5252
note: required by a bound in `Foo`
5353
--> $DIR/issue-67185-2.rs:14:30
5454
|
@@ -65,8 +65,8 @@ LL | fn f(_: impl Foo) {}
6565
| ^^^ the trait `Bar` is not implemented for `[[u16; 3]; 2]`
6666
|
6767
= help: the following other types implement trait `Bar`:
68-
[[u16; 3]; 3]
6968
[u16; 4]
69+
[[u16; 3]; 3]
7070
note: required by a bound in `Foo`
7171
--> $DIR/issue-67185-2.rs:14:30
7272
|
@@ -83,8 +83,8 @@ LL | fn f(_: impl Foo) {}
8383
| ^^^ the trait `Bar` is not implemented for `[u16; 3]`
8484
|
8585
= help: the following other types implement trait `Bar`:
86-
[[u16; 3]; 3]
8786
[u16; 4]
87+
[[u16; 3]; 3]
8888
note: required by a bound in `Foo`
8989
--> $DIR/issue-67185-2.rs:15:25
9090
|

‎tests/ui/consts/const-eval/const-eval-overflow-3b.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ LL | = [0; (i8::MAX + 1u8) as usize];
1212
|
1313
= help: the trait `Add<u8>` is not implemented for `i8`
1414
= help: the following other types implement trait `Add<Rhs>`:
15+
<i8 as Add>
16+
<i8 as Add<&i8>>
1517
<&'a i8 as Add<i8>>
1618
<&i8 as Add<&i8>>
17-
<i8 as Add<&i8>>
18-
<i8 as Add>
1919

2020
error: aborting due to 2 previous errors
2121

‎tests/ui/consts/const-eval/const-eval-overflow-4b.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ LL | : [u32; (i8::MAX as i8 + 1u8) as usize]
1212
|
1313
= help: the trait `Add<u8>` is not implemented for `i8`
1414
= help: the following other types implement trait `Add<Rhs>`:
15+
<i8 as Add>
16+
<i8 as Add<&i8>>
1517
<&'a i8 as Add<i8>>
1618
<&i8 as Add<&i8>>
17-
<i8 as Add<&i8>>
18-
<i8 as Add>
1919

2020
error[E0604]: only `u8` can be cast as `char`, not `i8`
2121
--> $DIR/const-eval-overflow-4b.rs:22:13

‎tests/ui/consts/missing-larger-array-impl.rs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
struct X;
2+
3+
// Make sure that we show the impl trait refs in the help message with
4+
// their evaluated constants, rather than `core::::array::{impl#30}::{constant#0}`
5+
6+
fn main() {
7+
<[X; 35] as Default>::default();
8+
//~^ ERROR the trait bound `[X; 35]: Default` is not satisfied
9+
}

‎tests/ui/consts/missing-larger-array-impl.stderr

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
error[E0277]: the trait bound `[X; 35]: Default` is not satisfied
2+
--> $DIR/missing-larger-array-impl.rs:7:5
3+
|
4+
LL | <[X; 35] as Default>::default();
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Default` is not implemented for `[X; 35]`
6+
|
7+
= help: the following other types implement trait `Default`:
8+
[T; 0]
9+
[T; 1]
10+
[T; 2]
11+
[T; 3]
12+
[T; 4]
13+
[T; 5]
14+
[T; 6]
15+
[T; 7]
16+
and 27 others
17+
18+
error: aborting due to previous error
19+
20+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/consts/too_generic_eval_ice.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ LL | [5; Self::HOST_SIZE] == [6; 0]
2222
|
2323
= help: the trait `PartialEq<[{integer}; 0]>` is not implemented for `[{integer}; Self::HOST_SIZE]`
2424
= help: the following other types implement trait `PartialEq<Rhs>`:
25-
<&[B] as PartialEq<[A; N]>>
26-
<&[T] as PartialEq<Vec<U, A>>>
27-
<&mut [B] as PartialEq<[A; N]>>
28-
<&mut [T] as PartialEq<Vec<U, A>>>
29-
<[A; N] as PartialEq<&[B]>>
30-
<[A; N] as PartialEq<&mut [B]>>
3125
<[A; N] as PartialEq<[B; N]>>
3226
<[A; N] as PartialEq<[B]>>
27+
<[A; N] as PartialEq<&[B]>>
28+
<[A; N] as PartialEq<&mut [B]>>
29+
<[T] as PartialEq<Vec<U, A>>>
30+
<[A] as PartialEq<[B]>>
31+
<[B] as PartialEq<[A; N]>>
32+
<&[T] as PartialEq<Vec<U, A>>>
3333
and 3 others
3434

3535
error: aborting due to 3 previous errors

0 commit comments

Comments
 (0)