do not use <: in subtyping overflow msg

This commit is contained in:
lcnr 2024-01-15 15:31:30 +01:00
parent f7cdff825c
commit 49dc0f22f4
15 changed files with 35 additions and 22 deletions

View File

@ -239,13 +239,26 @@ fn with_short_path<'tcx, T>(tcx: TyCtxt<'tcx>, value: T) -> String
} }
OverflowCause::TraitSolver(predicate) => { OverflowCause::TraitSolver(predicate) => {
let predicate = self.resolve_vars_if_possible(predicate); let predicate = self.resolve_vars_if_possible(predicate);
let pred_str = with_short_path(self.tcx, predicate); match predicate.kind().skip_binder() {
struct_span_code_err!( ty::PredicateKind::Subtype(ty::SubtypePredicate { a, b, a_is_expected: _ })
self.dcx(), | ty::PredicateKind::Coerce(ty::CoercePredicate { a, b }) => {
span, struct_span_code_err!(
E0275, self.dcx(),
"overflow evaluating the requirement `{pred_str}`", span,
) E0275,
"overflow setting `{a}` to a subtype of `{b}`",
)
}
_ => {
let pred_str = with_short_path(self.tcx, predicate);
struct_span_code_err!(
self.dcx(),
span,
E0275,
"overflow evaluating the requirement `{pred_str}`",
)
}
}
} }
}; };

View File

@ -29,5 +29,5 @@ pub fn new(race: R) {}
} }
fn main() { fn main() {
Race::new(|race| race.when()); //~ ERROR overflow evaluating the requirement `_ <: Option<_>` Race::new(|race| race.when()); //~ ERROR overflow setting `_` to a subtype of `Option<_>`
} }

View File

@ -1,4 +1,4 @@
error[E0275]: overflow evaluating the requirement `_ <: Option<_>` error[E0275]: overflow setting `_` to a subtype of `Option<_>`
--> $DIR/issue-84073.rs:32:22 --> $DIR/issue-84073.rs:32:22
| |
LL | Race::new(|race| race.when()); LL | Race::new(|race| race.when());

View File

@ -14,7 +14,7 @@ pub fn main() {
let mut x; let mut x;
loop { loop {
x = Box::new(x); x = Box::new(x);
//~^ ERROR overflow evaluating the requirement `Box<_> <: _` //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
x.foo; x.foo;
x.bar(); x.bar();
} }

View File

@ -1,4 +1,4 @@
error[E0275]: overflow evaluating the requirement `Box<_> <: _` error[E0275]: overflow setting `Box<_>` to a subtype of `_`
--> $DIR/infinite-autoderef.rs:16:13 --> $DIR/infinite-autoderef.rs:16:13
| |
LL | x = Box::new(x); LL | x = Box::new(x);

View File

@ -5,5 +5,5 @@ fn main() {
g = f; g = f;
f = Box::new(g); f = Box::new(g);
//~^ ERROR overflow evaluating the requirement `Box<_> <: _` //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
} }

View File

@ -1,4 +1,4 @@
error[E0275]: overflow evaluating the requirement `Box<_> <: _` error[E0275]: overflow setting `Box<_>` to a subtype of `_`
--> $DIR/occurs-check-2.rs:7:9 --> $DIR/occurs-check-2.rs:7:9
| |
LL | f = Box::new(g); LL | f = Box::new(g);

View File

@ -4,7 +4,7 @@ enum Clam<T> { A(T) }
fn main() { fn main() {
let c; let c;
c = Clam::A(c); c = Clam::A(c);
//~^ ERROR overflow evaluating the requirement `Clam<_> <: _` //~^ ERROR overflow setting `Clam<_>` to a subtype of `_`
match c { match c {
Clam::A::<isize>(_) => { } Clam::A::<isize>(_) => { }
} }

View File

@ -1,4 +1,4 @@
error[E0275]: overflow evaluating the requirement `Clam<_> <: _` error[E0275]: overflow setting `Clam<_>` to a subtype of `_`
--> $DIR/occurs-check-3.rs:6:9 --> $DIR/occurs-check-3.rs:6:9
| |
LL | c = Clam::A(c); LL | c = Clam::A(c);

View File

@ -1,5 +1,5 @@
fn main() { fn main() {
let f; let f;
f = Box::new(f); f = Box::new(f);
//~^ ERROR overflow evaluating the requirement `Box<_> <: _` //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
} }

View File

@ -1,4 +1,4 @@
error[E0275]: overflow evaluating the requirement `Box<_> <: _` error[E0275]: overflow setting `Box<_>` to a subtype of `_`
--> $DIR/occurs-check.rs:3:9 --> $DIR/occurs-check.rs:3:9
| |
LL | f = Box::new(f); LL | f = Box::new(f);

View File

@ -10,7 +10,7 @@ fn main() {
let x = return; let x = return;
let y = return; let y = return;
let mut w = (x, y); let mut w = (x, y);
//~^ ERROR overflow evaluating the requirement //~^ ERROR overflow setting `_` to a subtype of `*const _`
// Avoid creating lifetimes, `Sized` bounds or function calls. // Avoid creating lifetimes, `Sized` bounds or function calls.
let a = (ptr::addr_of!(y), ptr::addr_of!(x)); let a = (ptr::addr_of!(y), ptr::addr_of!(x));
w = a; w = a;

View File

@ -1,4 +1,4 @@
error[E0275]: overflow evaluating the requirement `_ <: *const _` error[E0275]: overflow setting `_` to a subtype of `*const _`
--> $DIR/subtype-recursion-limit.rs:12:17 --> $DIR/subtype-recursion-limit.rs:12:17
| |
LL | let mut w = (x, y); LL | let mut w = (x, y);

View File

@ -13,8 +13,8 @@ pub fn iso_un_option<A: 'static, B: 'static>(i: ISO<Option<A>, Option<B>>) -> IS
//~^ ERROR no field `ab` on type //~^ ERROR no field `ab` on type
//~| ERROR no field `ba` on type //~| ERROR no field `ba` on type
let left = move |o_a| match o_a { let left = move |o_a| match o_a {
//~^ ERROR overflow evaluating the requirement //~^ ERROR overflow setting `_` to a subtype of `Option<_>`
None => panic!("absured"), None => panic!("absurd"),
Some(a) => a, Some(a) => a,
}; };
let right = move |o_b| match o_b { let right = move |o_b| match o_b {

View File

@ -10,7 +10,7 @@ error[E0609]: no field `ba` on type `(Box<(dyn Fn(Option<A>) -> Option<B> + 'sta
LL | let (ab, ba) = (i.ab, i.ba); LL | let (ab, ba) = (i.ab, i.ba);
| ^^ unknown field | ^^ unknown field
error[E0275]: overflow evaluating the requirement `_ <: Option<_>` error[E0275]: overflow setting `_` to a subtype of `Option<_>`
--> $DIR/well-formed-recursion-limit.rs:15:33 --> $DIR/well-formed-recursion-limit.rs:15:33
| |
LL | let left = move |o_a| match o_a { LL | let left = move |o_a| match o_a {