Bless/update tests.

m-ou-se · m-ou-se · commit bb3d8c58a29f · 2025-05-07T18:00:09.000+02:00
diff --git a/tests/ui/borrowck/clone-on-ref.stderr b/tests/ui/borrowck/clone-on-ref.stderr
@@ -30,7 +30,7 @@ LL |     drop(x);
    |          ^ move out of `x` occurs here
 LL |
 LL |     println!("{b}");
-   |               --- borrow later used here
+   |                - borrow later used here
    |
 help: if `T` implemented `Clone`, you could clone the value
   --> $DIR/clone-on-ref.rs:11:8
@@ -57,7 +57,7 @@ LL |     drop(x);
    |          ^ move out of `x` occurs here
 LL |
 LL |     println!("{b:?}");
-   |               ----- borrow later used here
+   |                - borrow later used here
    |
 note: if `A` implemented `Clone`, you could clone the value
   --> $DIR/clone-on-ref.rs:19:1
diff --git a/tests/ui/consts/recursive-const-in-impl.stderr b/tests/ui/consts/recursive-const-in-impl.stderr
@@ -1,8 +1,8 @@
 error: queries overflow the depth limit!
-  --> $DIR/recursive-const-in-impl.rs:11:14
+  --> $DIR/recursive-const-in-impl.rs:11:20
    |
 LL |     println!("{}", Thing::<i32>::X);
-   |              ^^^^
+   |                    ^^^^^^^^^^^^^^^
    |
    = help: consider increasing the recursion limit by adding a `#![recursion_limit = "14"]` attribute to your crate (`recursive_const_in_impl`)
    = note: query depth increased by 9 when simplifying constant for the type system `main::promoted[1]`
diff --git a/tests/ui/impl-trait/precise-capturing/foreign-2021.stderr b/tests/ui/impl-trait/precise-capturing/foreign-2021.stderr
@@ -8,7 +8,7 @@ LL |     x.push(0);
    |     ^^^^^^^^^ mutable borrow occurs here
 ...
 LL |     println!("{h}");
-   |               --- immutable borrow later used here
+   |                - immutable borrow later used here
    |
 note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
   --> $DIR/foreign-2021.rs:7:13
diff --git a/tests/ui/impl-trait/precise-capturing/migration-note.stderr b/tests/ui/impl-trait/precise-capturing/migration-note.stderr
@@ -23,7 +23,7 @@ LL |     x.push(1);
    |     ^^^^^^^^^ mutable borrow occurs here
 ...
 LL |     println!("{a}");
-   |               --- immutable borrow later used here
+   |                - immutable borrow later used here
    |
 note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
   --> $DIR/migration-note.rs:16:13
@@ -99,7 +99,7 @@ LL |     x.push(1);
    |     ^ second mutable borrow occurs here
 ...
 LL |     println!("{a}");
-   |               --- first borrow later used here
+   |                - first borrow later used here
    |
 note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
   --> $DIR/migration-note.rs:63:13
@@ -175,7 +175,7 @@ LL |     s.f = 1;
    |     ^^^^^^^ `s.f` is assigned to here but it was already borrowed
 ...
 LL |     println!("{a}");
-   |               --- borrow later used here
+   |                - borrow later used here
    |
 note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
   --> $DIR/migration-note.rs:112:13
@@ -197,7 +197,7 @@ LL |     s.f = 1;
    |     ^^^^^^^ `s.f` is assigned to here but it was already borrowed
 ...
 LL |     println!("{a}");
-   |               --- borrow later used here
+   |                - borrow later used here
    |
 note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
   --> $DIR/migration-note.rs:128:13
@@ -219,7 +219,7 @@ LL |     s.f;
    |     ^^^ use of borrowed `s.f`
 ...
 LL |     println!("{a}");
-   |               --- borrow later used here
+   |                - borrow later used here
    |
 note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
   --> $DIR/migration-note.rs:140:13
diff --git a/tests/ui/issues/issue-27592.rs b/tests/ui/issues/issue-27592.rs
@@ -15,5 +15,5 @@ impl ::std::fmt::Write for Stream {
 fn main() {
     write(|| format_args!("{}", String::from("Hello world")));
     //~^ ERROR cannot return value referencing temporary value
-    //~| ERROR cannot return reference to temporary value
+    //~| ERROR cannot return reference to local binding
 }
diff --git a/tests/ui/issues/issue-27592.stderr b/tests/ui/issues/issue-27592.stderr
@@ -7,7 +7,7 @@ LL |     write(|| format_args!("{}", String::from("Hello world")));
    |              |                  temporary value created here
    |              returns a value referencing data owned by the current function
 
-error[E0515]: cannot return reference to temporary value
+error[E0515]: cannot return reference to local binding
   --> $DIR/issue-27592.rs:16:14
    |
 LL |     write(|| format_args!("{}", String::from("Hello world")));
diff --git a/tests/ui/issues/issue-69455.stderr b/tests/ui/issues/issue-69455.stderr
@@ -1,5 +1,5 @@
-error[E0284]: type annotations needed
-  --> $DIR/issue-69455.rs:29:41
+error[E0283]: type annotations needed
+  --> $DIR/issue-69455.rs:29:20
    |
 LL |     println!("{}", 23u64.test(xs.iter().sum()));
    |                          ----           ^^^ cannot infer type of the type parameter `S` declared on the method `sum`
@@ -35,5 +35,4 @@ LL |     println!("{}", 23u64.test(xs.iter().sum::<S>()));
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0283, E0284.
-For more information about an error, try `rustc --explain E0283`.
+For more information about this error, try `rustc --explain E0283`.
diff --git a/tests/ui/sized/unsized-binding.rs b/tests/ui/sized/unsized-binding.rs
@@ -1,5 +1,5 @@
 fn main() {
     let x = *""; //~ ERROR E0277
-    println!("{}", x);
-    println!("{}", x);
+    drop(x);
+    drop(x);
 }
diff --git a/tests/ui/suggestions/bound-suggestions.stderr b/tests/ui/suggestions/bound-suggestions.stderr
@@ -2,7 +2,9 @@ error[E0277]: `impl Sized` doesn't implement `Debug`
   --> $DIR/bound-suggestions.rs:9:22
    |
 LL |     println!("{:?}", t);
-   |                      ^ `impl Sized` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               ----   ^ `impl Sized` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               |
+   |               required by a bound introduced by this call
    |
 help: consider restricting opaque type `impl Sized` with trait `Debug`
    |
@@ -13,7 +15,9 @@ error[E0277]: `T` doesn't implement `Debug`
   --> $DIR/bound-suggestions.rs:15:22
    |
 LL |     println!("{:?}", t);
-   |                      ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               ----   ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               |
+   |               required by a bound introduced by this call
    |
 help: consider restricting type parameter `T` with trait `Debug`
    |
@@ -24,7 +28,9 @@ error[E0277]: `T` doesn't implement `Debug`
   --> $DIR/bound-suggestions.rs:21:22
    |
 LL |     println!("{:?}", t);
-   |                      ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               ----   ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               |
+   |               required by a bound introduced by this call
    |
 help: consider further restricting type parameter `T` with trait `Debug`
    |
@@ -47,7 +53,9 @@ error[E0277]: `X` doesn't implement `Debug`
   --> $DIR/bound-suggestions.rs:33:22
    |
 LL |     println!("{:?}", x);
-   |                      ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               ----   ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               |
+   |               required by a bound introduced by this call
    |
 help: consider further restricting type parameter `X` with trait `Debug`
    |
@@ -58,7 +66,9 @@ error[E0277]: `X` doesn't implement `Debug`
   --> $DIR/bound-suggestions.rs:39:22
    |
 LL |     println!("{:?}", x);
-   |                      ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               ----   ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               |
+   |               required by a bound introduced by this call
    |
 help: consider further restricting type parameter `X` with trait `Debug`
    |
diff --git a/tests/ui/suggestions/issue-97760.stderr b/tests/ui/suggestions/issue-97760.stderr
@@ -1,5 +1,5 @@
 error[E0277]: `<impl IntoIterator as IntoIterator>::Item` doesn't implement `std::fmt::Display`
-  --> $DIR/issue-97760.rs:4:19
+  --> $DIR/issue-97760.rs:4:20
    |
 LL |         println!("{x}");
    |                   ^^^ `<impl IntoIterator as IntoIterator>::Item` cannot be formatted with the default formatter
diff --git a/tests/ui/suggestions/path-display.stderr b/tests/ui/suggestions/path-display.stderr
@@ -2,7 +2,9 @@ error[E0277]: `Path` doesn't implement `std::fmt::Display`
   --> $DIR/path-display.rs:5:20
    |
 LL |     println!("{}", path);
-   |                    ^^^^ `Path` cannot be formatted with the default formatter; call `.display()` on it
+   |               --   ^^^^ `Path` cannot be formatted with the default formatter; call `.display()` on it
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `std::fmt::Display` is not implemented for `Path`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
@@ -12,7 +14,9 @@ error[E0277]: `PathBuf` doesn't implement `std::fmt::Display`
   --> $DIR/path-display.rs:9:20
    |
 LL |     println!("{}", path);
-   |                    ^^^^ `PathBuf` cannot be formatted with the default formatter; call `.display()` on it
+   |               --   ^^^^ `PathBuf` cannot be formatted with the default formatter; call `.display()` on it
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `std::fmt::Display` is not implemented for `PathBuf`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
diff --git a/tests/ui/traits/next-solver/assembly/runaway-impl-candidate-selection.stderr b/tests/ui/traits/next-solver/assembly/runaway-impl-candidate-selection.stderr
@@ -2,7 +2,9 @@ error[E0283]: type annotations needed
   --> $DIR/runaway-impl-candidate-selection.rs:13:22
    |
 LL |     println!("{:?}", iter::<_>());
-   |                      ^^^^^^^^^ cannot infer type of the type parameter `T` declared on the function `iter`
+   |               ----   ^^^^^^^^^^^ cannot infer type
+   |               |
+   |               required by a bound introduced by this call
    |
    = note: cannot satisfy `_: Iterator`
 note: required by a bound in `iter`
diff --git a/tests/ui/type-alias-impl-trait/nested.stderr b/tests/ui/type-alias-impl-trait/nested.stderr
@@ -15,7 +15,9 @@ error[E0277]: `Bar` doesn't implement `Debug`
   --> $DIR/nested.rs:17:22
    |
 LL |     println!("{:?}", bar());
-   |                      ^^^^^ `Bar` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               ----   ^^^^^ `Bar` cannot be formatted using `{:?}` because it doesn't implement `Debug`
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `Debug` is not implemented for `Bar`
 
diff --git a/tests/ui/type/binding-assigned-block-without-tail-expression.stderr b/tests/ui/type/binding-assigned-block-without-tail-expression.stderr
@@ -5,7 +5,9 @@ LL |         42;
    |           - help: remove this semicolon
 ...
 LL |     println!("{}", x);
-   |                    ^ `()` cannot be formatted with the default formatter
+   |               --   ^ `()` cannot be formatted with the default formatter
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `std::fmt::Display` is not implemented for `()`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
@@ -17,7 +19,9 @@ LL |     let y = {};
    |             -- this empty block is missing a tail expression
 ...
 LL |     println!("{}", y);
-   |                    ^ `()` cannot be formatted with the default formatter
+   |               --   ^ `()` cannot be formatted with the default formatter
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `std::fmt::Display` is not implemented for `()`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
@@ -29,7 +33,9 @@ LL |         "hi";
    |             - help: remove this semicolon
 ...
 LL |     println!("{}", z);
-   |                    ^ `()` cannot be formatted with the default formatter
+   |               --   ^ `()` cannot be formatted with the default formatter
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `std::fmt::Display` is not implemented for `()`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
@@ -43,8 +49,10 @@ LL | |         S;
 LL | |     };
    | |_____- this block is missing a tail expression
 ...
-LL |       println!("{}", s);
-   |                      ^ `()` cannot be formatted with the default formatter
+LL |     println!("{}", s);
+   |               --   ^ `()` cannot be formatted with the default formatter
+   |               |
+   |               required by a bound introduced by this call
    |
    = help: the trait `std::fmt::Display` is not implemented for `()`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`error: queries overflow the depth limit!`
`2`		`- --> $DIR/recursive-const-in-impl.rs:11:14`
	`2`	`+ --> $DIR/recursive-const-in-impl.rs:11:20`
`3`	`3`	`\|`
`4`	`4`	`LL \| println!("{}", Thing::<i32>::X);`
`5`		`- \| ^^^^`
	`5`	`+ \| ^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= help: consider increasing the recursion limit by adding a `#![recursion_limit = "14"]` attribute to your crate (`recursive_const_in_impl`)
`8`	`8`	= note: query depth increased by 9 when simplifying constant for the type system `main::promoted[1]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ LL \| x.push(0);`
`8`	`8`	`\| ^^^^^^^^^ mutable borrow occurs here`
`9`	`9`	`...`
`10`	`10`	`LL \| println!("{h}");`
`11`		`- \| --- immutable borrow later used here`
	`11`	`+ \| - immutable borrow later used here`
`12`	`12`	`\|`
`13`	`13`	note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
`14`	`14`	`--> $DIR/foreign-2021.rs:7:13`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ impl ::std::fmt::Write for Stream {`
`15`	`15`	`fn main() {`
`16`	`16`	`write(\|\| format_args!("{}", String::from("Hello world")));`
`17`	`17`	`//~^ ERROR cannot return value referencing temporary value`
`18`		`- //~\| ERROR cannot return reference to temporary value`
	`18`	`+ //~\| ERROR cannot return reference to local binding`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| write(\|\| format_args!("{}", String::from("Hello world")));`
`7`	`7`	`\| \| temporary value created here`
`8`	`8`	`\| returns a value referencing data owned by the current function`
`9`	`9`
`10`		`-error[E0515]: cannot return reference to temporary value`
	`10`	`+error[E0515]: cannot return reference to local binding`
`11`	`11`	`--> $DIR/issue-27592.rs:16:14`
`12`	`12`	`\|`
`13`	`13`	`LL \| write(\|\| format_args!("{}", String::from("Hello world")));`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`fn main() {`
`2`	`2`	`let x = *""; //~ ERROR E0277`
`3`		`- println!("{}", x);`
`4`		`- println!("{}", x);`
	`3`	`+ drop(x);`
	`4`	`+ drop(x);`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,9 @@ error[E0277]: `impl Sized` doesn't implement `Debug`
`2`	`2`	`--> $DIR/bound-suggestions.rs:9:22`
`3`	`3`	`\|`
`4`	`4`	`LL \| println!("{:?}", t);`
`5`		- \| ^ `impl Sized` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`5`	+ \| ---- ^ `impl Sized` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`6`	`+ \| \|`
	`7`	`+ \| required by a bound introduced by this call`
`6`	`8`	`\|`
`7`	`9`	help: consider restricting opaque type `impl Sized` with trait `Debug`
`8`	`10`	`\|`
@@ -13,7 +15,9 @@ error[E0277]: `T` doesn't implement `Debug`
`13`	`15`	`--> $DIR/bound-suggestions.rs:15:22`
`14`	`16`	`\|`
`15`	`17`	`LL \| println!("{:?}", t);`
`16`		- \| ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`18`	+ \| ---- ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`19`	`+ \| \|`
	`20`	`+ \| required by a bound introduced by this call`
`17`	`21`	`\|`
`18`	`22`	help: consider restricting type parameter `T` with trait `Debug`
`19`	`23`	`\|`
@@ -24,7 +28,9 @@ error[E0277]: `T` doesn't implement `Debug`
`24`	`28`	`--> $DIR/bound-suggestions.rs:21:22`
`25`	`29`	`\|`
`26`	`30`	`LL \| println!("{:?}", t);`
`27`		- \| ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`31`	+ \| ---- ^ `T` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`32`	`+ \| \|`
	`33`	`+ \| required by a bound introduced by this call`
`28`	`34`	`\|`
`29`	`35`	help: consider further restricting type parameter `T` with trait `Debug`
`30`	`36`	`\|`
@@ -47,7 +53,9 @@ error[E0277]: `X` doesn't implement `Debug`
`47`	`53`	`--> $DIR/bound-suggestions.rs:33:22`
`48`	`54`	`\|`
`49`	`55`	`LL \| println!("{:?}", x);`
`50`		- \| ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`56`	+ \| ---- ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`57`	`+ \| \|`
	`58`	`+ \| required by a bound introduced by this call`
`51`	`59`	`\|`
`52`	`60`	help: consider further restricting type parameter `X` with trait `Debug`
`53`	`61`	`\|`
@@ -58,7 +66,9 @@ error[E0277]: `X` doesn't implement `Debug`
`58`	`66`	`--> $DIR/bound-suggestions.rs:39:22`
`59`	`67`	`\|`
`60`	`68`	`LL \| println!("{:?}", x);`
`61`		- \| ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`69`	+ \| ---- ^ `X` cannot be formatted using `{:?}` because it doesn't implement `Debug`
	`70`	`+ \| \|`
	`71`	`+ \| required by a bound introduced by this call`
`62`	`72`	`\|`
`63`	`73`	help: consider further restricting type parameter `X` with trait `Debug`
`64`	`74`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0277]: `<impl IntoIterator as IntoIterator>::Item` doesn't implement `std::fmt::Display`
`2`		`- --> $DIR/issue-97760.rs:4:19`
	`2`	`+ --> $DIR/issue-97760.rs:4:20`
`3`	`3`	`\|`
`4`	`4`	`LL \| println!("{x}");`
`5`	`5`	\| ^^^ `<impl IntoIterator as IntoIterator>::Item` cannot be formatted with the default formatter