fix comments in required-consts tests

RalfJung · RalfJung · commit 6306c1782335 · 2024-03-17T09:29:47.000+01:00
diff --git a/tests/ui/consts/required-consts/collect-in-dead-drop.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-drop.noopt.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-drop.rs:9:19
+  --> $DIR/collect-in-dead-drop.rs:8:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-drop.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-drop.rs:8:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-drop.rs:16:17
+  --> $DIR/collect-in-dead-drop.rs:15:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-drop.opt.stderr b/tests/ui/consts/required-consts/collect-in-dead-drop.opt.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-drop.rs:9:19
+  --> $DIR/collect-in-dead-drop.rs:8:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-drop.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-drop.rs:8:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-drop.rs:16:17
+  --> $DIR/collect-in-dead-drop.rs:15:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-drop.rs b/tests/ui/consts/required-consts/collect-in-dead-drop.rs
@@ -1,8 +1,7 @@
 //@revisions: noopt opt
 //@ build-fail
 //@[opt] compile-flags: -O
-//! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
-//! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
+//! This fails without optimizations, so it should also fail with optimizations.
 
 struct Fail<T>(T);
 impl<T> Fail<T> {
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn.noopt.stderr
@@ -1,19 +1,19 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-fn.rs:9:19
+  --> $DIR/collect-in-dead-fn.rs:8:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-fn.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-fn.rs:8:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn.rs:19:17
+  --> $DIR/collect-in-dead-fn.rs:18:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
 
 note: the above error was encountered while instantiating `fn not_called::<i32>`
-  --> $DIR/collect-in-dead-fn.rs:26:9
+  --> $DIR/collect-in-dead-fn.rs:25:9
    |
 LL |         not_called::<T>();
    |         ^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn.opt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn.opt.stderr
@@ -1,19 +1,19 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-fn.rs:9:19
+  --> $DIR/collect-in-dead-fn.rs:8:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-fn.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-fn.rs:8:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn.rs:19:17
+  --> $DIR/collect-in-dead-fn.rs:18:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
 
 note: the above error was encountered while instantiating `fn not_called::<i32>`
-  --> $DIR/collect-in-dead-fn.rs:26:9
+  --> $DIR/collect-in-dead-fn.rs:25:9
    |
 LL |         not_called::<T>();
    |         ^^^^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn.rs b/tests/ui/consts/required-consts/collect-in-dead-fn.rs
@@ -1,8 +1,7 @@
 //@revisions: noopt opt
 //@ build-fail
 //@[opt] compile-flags: -O
-//! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
-//! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
+//! This fails without optimizations, so it should also fail with optimizations.
 
 struct Fail<T>(T);
 impl<T> Fail<T> {
diff --git a/tests/ui/consts/required-consts/collect-in-dead-forget.rs b/tests/ui/consts/required-consts/collect-in-dead-forget.rs
@@ -1,8 +1,7 @@
 //@revisions: noopt opt
 //@build-pass
 //@[opt] compile-flags: -O
-//! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
-//! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
+//! This passes without optimizations, so it can (and should) also pass with optimizations.
 
 struct Fail<T>(T);
 impl<T> Fail<T> {
diff --git a/tests/ui/consts/required-consts/collect-in-dead-move.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-move.noopt.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-move.rs:9:19
+  --> $DIR/collect-in-dead-move.rs:8:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-move.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-move.rs:8:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-move.rs:16:17
+  --> $DIR/collect-in-dead-move.rs:15:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-move.opt.stderr b/tests/ui/consts/required-consts/collect-in-dead-move.opt.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-move.rs:9:19
+  --> $DIR/collect-in-dead-move.rs:8:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-move.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-move.rs:8:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-move.rs:16:17
+  --> $DIR/collect-in-dead-move.rs:15:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-move.rs b/tests/ui/consts/required-consts/collect-in-dead-move.rs
@@ -1,8 +1,7 @@
 //@revisions: noopt opt
 //@ build-fail
 //@[opt] compile-flags: -O
-//! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
-//! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
+//! This fails without optimizations, so it should also fail with optimizations.
 
 struct Fail<T>(T);
 impl<T> Fail<T> {
diff --git a/tests/ui/consts/required-consts/collect-in-dead-vtable.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-vtable.noopt.stderr
@@ -1,19 +1,19 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/collect-in-dead-vtable.rs:12:19
+  --> $DIR/collect-in-dead-vtable.rs:11:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-vtable.rs:12:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-vtable.rs:11:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-vtable.rs:26:21
+  --> $DIR/collect-in-dead-vtable.rs:25:21
    |
 LL |             let _ = Fail::<T>::C;
    |                     ^^^^^^^^^^^^
 
 note: the above error was encountered while instantiating `fn <std::vec::Vec<i32> as MyTrait>::not_called`
-  --> $DIR/collect-in-dead-vtable.rs:35:40
+  --> $DIR/collect-in-dead-vtable.rs:34:40
    |
 LL |         let gen_vtable: &dyn MyTrait = &v; // vtable "appears" here
    |                                        ^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-vtable.rs b/tests/ui/consts/required-consts/collect-in-dead-vtable.rs
@@ -4,8 +4,7 @@
 //FIXME: `opt` revision currently does not stop with an error due to
 //<https://github.com/rust-lang/rust/issues/107503>.
 //@[opt] build-pass
-//! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
-//! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
+//! This fails without optimizations, so it should also fail with optimizations.
 
 struct Fail<T>(T);
 impl<T> Fail<T> {

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	error[E0080]: evaluation of `Fail::<i32>::C` failed
`2`		`- --> $DIR/collect-in-dead-drop.rs:9:19`
	`2`	`+ --> $DIR/collect-in-dead-drop.rs:8:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| const C: () = panic!();`
`5`		`- \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-drop.rs:9:19`
	`5`	`+ \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-drop.rs:8:19`
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
`9`	`9`	`note: erroneous constant encountered`
`10`		`- --> $DIR/collect-in-dead-drop.rs:16:17`
	`10`	`+ --> $DIR/collect-in-dead-drop.rs:15:17`
`11`	`11`	`\|`
`12`	`12`	`LL \| let _ = Fail::<T>::C;`
`13`	`13`	`\| ^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	error[E0080]: evaluation of `Fail::<i32>::C` failed
`2`		`- --> $DIR/collect-in-dead-fn.rs:9:19`
	`2`	`+ --> $DIR/collect-in-dead-fn.rs:8:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| const C: () = panic!();`
`5`		`- \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-fn.rs:9:19`
	`5`	`+ \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-fn.rs:8:19`
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
`9`	`9`	`note: erroneous constant encountered`
`10`		`- --> $DIR/collect-in-dead-fn.rs:19:17`
	`10`	`+ --> $DIR/collect-in-dead-fn.rs:18:17`
`11`	`11`	`\|`
`12`	`12`	`LL \| let _ = Fail::<T>::C;`
`13`	`13`	`\| ^^^^^^^^^^^^`
`14`	`14`
`15`	`15`	note: the above error was encountered while instantiating `fn not_called::<i32>`
`16`		`- --> $DIR/collect-in-dead-fn.rs:26:9`
	`16`	`+ --> $DIR/collect-in-dead-fn.rs:25:9`
`17`	`17`	`\|`
`18`	`18`	`LL \| not_called::<T>();`
`19`	`19`	`\| ^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	error[E0080]: evaluation of `Fail::<i32>::C` failed
`2`		`- --> $DIR/collect-in-dead-move.rs:9:19`
	`2`	`+ --> $DIR/collect-in-dead-move.rs:8:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| const C: () = panic!();`
`5`		`- \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-move.rs:9:19`
	`5`	`+ \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-move.rs:8:19`
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
`9`	`9`	`note: erroneous constant encountered`
`10`		`- --> $DIR/collect-in-dead-move.rs:16:17`
	`10`	`+ --> $DIR/collect-in-dead-move.rs:15:17`
`11`	`11`	`\|`
`12`	`12`	`LL \| let _ = Fail::<T>::C;`
`13`	`13`	`\| ^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	error[E0080]: evaluation of `Fail::<i32>::C` failed
`2`		`- --> $DIR/collect-in-dead-vtable.rs:12:19`
	`2`	`+ --> $DIR/collect-in-dead-vtable.rs:11:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| const C: () = panic!();`
`5`		`- \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-vtable.rs:12:19`
	`5`	`+ \| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-dead-vtable.rs:11:19`
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
`9`	`9`	`note: erroneous constant encountered`
`10`		`- --> $DIR/collect-in-dead-vtable.rs:26:21`
	`10`	`+ --> $DIR/collect-in-dead-vtable.rs:25:21`
`11`	`11`	`\|`
`12`	`12`	`LL \| let _ = Fail::<T>::C;`
`13`	`13`	`\| ^^^^^^^^^^^^`
`14`	`14`
`15`	`15`	note: the above error was encountered while instantiating `fn <std::vec::Vec<i32> as MyTrait>::not_called`
`16`		`- --> $DIR/collect-in-dead-vtable.rs:35:40`
	`16`	`+ --> $DIR/collect-in-dead-vtable.rs:34:40`
`17`	`17`	`\|`
`18`	`18`	`LL \| let gen_vtable: &dyn MyTrait = &v; // vtable "appears" here`
`19`	`19`	`\| ^^`