change error messages to be incorrect, but more helpful

lcnr · lcnr · commit c71484eefd38 · 2024-02-22T18:18:33.000+01:00
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs
@@ -246,7 +246,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
                             self.dcx(),
                             span,
                             E0275,
-                            "overflow setting `{a}` to a subtype of `{b}`",
+                            "overflow assigning `{a}` to `{b}`",
                         )
                     }
                     _ => {
diff --git a/tests/ui/impl-trait/issues/issue-84073.rs b/tests/ui/impl-trait/issues/issue-84073.rs
@@ -29,5 +29,5 @@ where
 }
 
 fn main() {
-    Race::new(|race| race.when()); //~ ERROR overflow setting `_` to a subtype of `Option<_>`
+    Race::new(|race| race.when()); //~ ERROR overflow assigning `_` to `Option<_>`
 }
diff --git a/tests/ui/impl-trait/issues/issue-84073.stderr b/tests/ui/impl-trait/issues/issue-84073.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow setting `_` to a subtype of `Option<_>`
+error[E0275]: overflow assigning `_` to `Option<_>`
   --> $DIR/issue-84073.rs:32:22
    |
 LL |     Race::new(|race| race.when());
diff --git a/tests/ui/infinite/infinite-autoderef.rs b/tests/ui/infinite/infinite-autoderef.rs
@@ -14,7 +14,7 @@ pub fn main() {
     let mut x;
     loop {
         x = Box::new(x);
-        //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
+        //~^ ERROR overflow assigning `Box<_>` to `_`
         x.foo;
         x.bar();
     }
diff --git a/tests/ui/infinite/infinite-autoderef.stderr b/tests/ui/infinite/infinite-autoderef.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow setting `Box<_>` to a subtype of `_`
+error[E0275]: overflow assigning `Box<_>` to `_`
   --> $DIR/infinite-autoderef.rs:16:13
    |
 LL |         x = Box::new(x);
diff --git a/tests/ui/occurs-check-2.rs b/tests/ui/occurs-check-2.rs
@@ -5,5 +5,5 @@ fn main() {
 
     g = f;
     f = Box::new(g);
-    //~^ ERROR  overflow setting `Box<_>` to a subtype of `_`
+    //~^ ERROR overflow assigning `Box<_>` to `_`
 }
diff --git a/tests/ui/occurs-check-2.stderr b/tests/ui/occurs-check-2.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow setting `Box<_>` to a subtype of `_`
+error[E0275]: overflow assigning `Box<_>` to `_`
   --> $DIR/occurs-check-2.rs:7:9
    |
 LL |     f = Box::new(g);
diff --git a/tests/ui/occurs-check-3.rs b/tests/ui/occurs-check-3.rs
@@ -4,7 +4,7 @@ enum Clam<T> { A(T) }
 fn main() {
     let c;
     c = Clam::A(c);
-    //~^ ERROR overflow setting `Clam<_>` to a subtype of `_`
+    //~^ ERROR overflow assigning `Clam<_>` to `_`
     match c {
         Clam::A::<isize>(_) => { }
     }
diff --git a/tests/ui/occurs-check-3.stderr b/tests/ui/occurs-check-3.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow setting `Clam<_>` to a subtype of `_`
+error[E0275]: overflow assigning `Clam<_>` to `_`
   --> $DIR/occurs-check-3.rs:6:9
    |
 LL |     c = Clam::A(c);
diff --git a/tests/ui/occurs-check.rs b/tests/ui/occurs-check.rs
@@ -1,5 +1,5 @@
 fn main() {
     let f;
     f = Box::new(f);
-    //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
+    //~^ ERROR overflow assigning `Box<_>` to `_`
 }
diff --git a/tests/ui/occurs-check.stderr b/tests/ui/occurs-check.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow setting `Box<_>` to a subtype of `_`
+error[E0275]: overflow assigning `Box<_>` to `_`
   --> $DIR/occurs-check.rs:3:9
    |
 LL |     f = Box::new(f);
diff --git a/tests/ui/traits/subtype-recursion-limit.rs b/tests/ui/traits/subtype-recursion-limit.rs
@@ -10,7 +10,7 @@ fn main() {
     let x = return;
     let y = return;
     let mut w = (x, y);
-    //~^ ERROR overflow setting `_` to a subtype of `*const _`
+    //~^ ERROR overflow assigning `_` to `*const _`
     // Avoid creating lifetimes, `Sized` bounds or function calls.
     let a = (ptr::addr_of!(y), ptr::addr_of!(x));
     w = a;
diff --git a/tests/ui/traits/subtype-recursion-limit.stderr b/tests/ui/traits/subtype-recursion-limit.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow setting `_` to a subtype of `*const _`
+error[E0275]: overflow assigning `_` to `*const _`
   --> $DIR/subtype-recursion-limit.rs:12:17
    |
 LL |     let mut w = (x, y);
diff --git a/tests/ui/traits/well-formed-recursion-limit.rs b/tests/ui/traits/well-formed-recursion-limit.rs
@@ -13,7 +13,7 @@ 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 `ba` on type
     let left = move |o_a| match o_a {
-        //~^ ERROR overflow setting `_` to a subtype of `Option<_>`
+        //~^ ERROR overflow assigning `_` to `Option<_>`
         None => panic!("absurd"),
         Some(a) => a,
     };
diff --git a/tests/ui/traits/well-formed-recursion-limit.stderr b/tests/ui/traits/well-formed-recursion-limit.stderr
@@ -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);
    |                             ^^ unknown field
 
-error[E0275]: overflow setting `_` to a subtype of `Option<_>`
+error[E0275]: overflow assigning `_` to `Option<_>`
   --> $DIR/well-formed-recursion-limit.rs:15:33
    |
 LL |     let left = move |o_a| match o_a {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {`
`246`	`246`	`self.dcx(),`
`247`	`247`	`span,`
`248`	`248`	`E0275,`
`249`		- "overflow setting `{a}` to a subtype of `{b}`",
	`249`	+ "overflow assigning `{a}` to `{b}`",
`250`	`250`	`)`
`251`	`251`	`}`
`252`	`252`	`_ => {`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ where`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`fn main() {`
`32`		- Race::new(\|race\| race.when()); //~ ERROR overflow setting `_` to a subtype of `Option<_>`
	`32`	+ Race::new(\|race\| race.when()); //~ ERROR overflow assigning `_` to `Option<_>`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0275]: overflow setting `_` to a subtype of `Option<_>`
	`1`	+error[E0275]: overflow assigning `_` to `Option<_>`
`2`	`2`	`--> $DIR/issue-84073.rs:32:22`
`3`	`3`	`\|`
`4`	`4`	`LL \| Race::new(\|race\| race.when());`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pub fn main() {`
`14`	`14`	`let mut x;`
`15`	`15`	`loop {`
`16`	`16`	`x = Box::new(x);`
`17`		- //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
	`17`	+ //~^ ERROR overflow assigning `Box<_>` to `_`
`18`	`18`	`x.foo;`
`19`	`19`	`x.bar();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0275]: overflow setting `Box<_>` to a subtype of `_`
	`1`	+error[E0275]: overflow assigning `Box<_>` to `_`
`2`	`2`	`--> $DIR/infinite-autoderef.rs:16:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| x = Box::new(x);`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ fn main() {`
`5`	`5`
`6`	`6`	`g = f;`
`7`	`7`	`f = Box::new(g);`
`8`		- //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
	`8`	+ //~^ ERROR overflow assigning `Box<_>` to `_`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ enum Clam<T> { A(T) }`
`4`	`4`	`fn main() {`
`5`	`5`	`let c;`
`6`	`6`	`c = Clam::A(c);`
`7`		- //~^ ERROR overflow setting `Clam<_>` to a subtype of `_`
	`7`	+ //~^ ERROR overflow assigning `Clam<_>` to `_`
`8`	`8`	`match c {`
`9`	`9`	`Clam::A::<isize>(_) => { }`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0275]: overflow setting `Clam<_>` to a subtype of `_`
	`1`	+error[E0275]: overflow assigning `Clam<_>` to `_`
`2`	`2`	`--> $DIR/occurs-check-3.rs:6:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| c = Clam::A(c);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`fn main() {`
`2`	`2`	`let f;`
`3`	`3`	`f = Box::new(f);`
`4`		- //~^ ERROR overflow setting `Box<_>` to a subtype of `_`
	`4`	+ //~^ ERROR overflow assigning `Box<_>` to `_`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ error[E0609]: no field `ba` on type `(Box<(dyn Fn(Option<A>) -> Option<B> + 'sta
`10`	`10`	`LL \| let (ab, ba) = (i.ab, i.ba);`
`11`	`11`	`\| ^^ unknown field`
`12`	`12`
`13`		-error[E0275]: overflow setting `_` to a subtype of `Option<_>`
	`13`	+error[E0275]: overflow assigning `_` to `Option<_>`
`14`	`14`	`--> $DIR/well-formed-recursion-limit.rs:15:33`
`15`	`15`	`\|`
`16`	`16`	`LL \| let left = move \|o_a\| match o_a {`