Fixup a few tests

rust-lang · Jun 4, 2024 · 517dfc0 · 517dfc0
1 parent e8d0b68
commit 517dfc0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/tests/crashes/101962.rs b/tests/crashes/101962.rs
@@ -1,4 +1,5 @@
 //@ known-bug: #101962
+//@ compile-flags: -Cdebuginfo=2
 
 #![feature(core_intrinsics)]
 

diff --git a/tests/crashes/79409.rs b/tests/crashes/79409.rs
@@ -1,4 +1,5 @@
 //@ known-bug: #79409
+//@ compile-flags: -Cdebuginfo=2
 
 #![feature(extern_types)]
 #![feature(unsized_locals)]

diff --git a/tests/ui/consts/required-consts/collect-in-promoted-const.noopt.stderr b/tests/ui/consts/required-consts/collect-in-promoted-const.noopt.stderr
@@ -7,13 +7,13 @@ LL |     const C: () = panic!();
    = 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-promoted-const.rs:20:21
+  --> $DIR/collect-in-promoted-const.rs:17:21
    |
 LL |         let _val = &Fail::<T>::C;
    |                     ^^^^^^^^^^^^
 
 note: the above error was encountered while instantiating `fn f::<i32>`
-  --> $DIR/collect-in-promoted-const.rs:25:5
+  --> $DIR/collect-in-promoted-const.rs:22:5
    |
 LL |     f::<i32>();
    |     ^^^^^^^^^^

diff --git a/tests/ui/consts/required-consts/collect-in-promoted-const.opt.stderr b/tests/ui/consts/required-consts/collect-in-promoted-const.opt.stderr
@@ -1,17 +1,3 @@
-error[E0080]: evaluation of `Fail::<T>::C` failed
-  --> $DIR/collect-in-promoted-const.rs:9:19
-   |
-LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/collect-in-promoted-const.rs:9: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-promoted-const.rs:20:21
-   |
-LL |         let _val = &Fail::<T>::C;
-   |                     ^^^^^^^^^^^^
-
 error[E0080]: evaluation of `Fail::<i32>::C` failed
   --> $DIR/collect-in-promoted-const.rs:9:19
    |
@@ -21,19 +7,17 @@ LL |     const C: () = panic!();
    = 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-promoted-const.rs:20:21
+  --> $DIR/collect-in-promoted-const.rs:17:21
    |
 LL |         let _val = &Fail::<T>::C;
    |                     ^^^^^^^^^^^^
-   |
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 note: the above error was encountered while instantiating `fn f::<i32>`
-  --> $DIR/collect-in-promoted-const.rs:25:5
+  --> $DIR/collect-in-promoted-const.rs:22:5
    |
 LL |     f::<i32>();
    |     ^^^^^^^^^^
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/consts/required-consts/collect-in-promoted-const.rs b/tests/ui/consts/required-consts/collect-in-promoted-const.rs
@@ -7,9 +7,6 @@
 struct Fail<T>(T);
 impl<T> Fail<T> {
     const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
-    //[opt]~^ ERROR evaluation of `Fail::<T>::C` failed
-    // (Not sure why optimizations lead to this being emitted twice, but as long as compilation
-    // fails either way it's fine.)
 }
 
 #[inline(never)]