Auto merge of #146394 - Enselic:debuginfo-level-tests-2, r=<try>

rust-bors[bot] · web-flow · commit 24a192280bd0 · 2025-09-12T05:30:46.000Z
ci: Increase `rust.debuginfo-level-tests` to `2` in `x86_64-gnu-debug` job

try-job: x86_64-gnu-debug
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
@@ -38,7 +38,7 @@ ENV RUST_CONFIGURE_ARGS \
       --build=x86_64-unknown-linux-gnu \
       --enable-debug \
       --enable-lld \
-      --set rust.debuginfo-level-tests=1 \
+      --set rust.debuginfo-level-tests=2 \
       --set llvm.use-linker=lld \
       --set target.x86_64-unknown-linux-gnu.linker=clang \
       --set target.x86_64-unknown-linux-gnu.cc=clang \
diff --git a/tests/ui/async-await/future-sizes/async-awaiting-fut.rs b/tests/ui/async-await/future-sizes/async-awaiting-fut.rs
@@ -1,3 +1,5 @@
+// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
+//@ compile-flags: -C debuginfo=0
 //@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type lib
 //@ needs-deterministic-layouts
 //@ edition:2021
diff --git a/tests/ui/async-await/future-sizes/large-arg.rs b/tests/ui/async-await/future-sizes/large-arg.rs
@@ -1,3 +1,5 @@
+// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
+//@ compile-flags: -C debuginfo=0
 //@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type=lib
 //@ needs-deterministic-layouts
 //@ edition: 2021
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
@@ -1,17 +1,17 @@
 error[E0080]: evaluation panicked: explicit panic
-  --> $DIR/collect-in-promoted-const.rs:9:19
+  --> $DIR/collect-in-promoted-const.rs:11:19
    |
 LL |     const C: () = panic!();
    |                   ^^^^^^^^ evaluation of `Fail::<i32>::C` failed here
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-promoted-const.rs:20:21
+  --> $DIR/collect-in-promoted-const.rs:22: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:27: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,31 +1,31 @@
 error[E0080]: evaluation panicked: explicit panic
-  --> $DIR/collect-in-promoted-const.rs:9:19
+  --> $DIR/collect-in-promoted-const.rs:11:19
    |
 LL |     const C: () = panic!();
    |                   ^^^^^^^^ evaluation of `Fail::<T>::C` failed here
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-promoted-const.rs:20:21
+  --> $DIR/collect-in-promoted-const.rs:22:21
    |
 LL |         let _val = &Fail::<T>::C;
    |                     ^^^^^^^^^^^^
 
 error[E0080]: evaluation panicked: explicit panic
-  --> $DIR/collect-in-promoted-const.rs:9:19
+  --> $DIR/collect-in-promoted-const.rs:11:19
    |
 LL |     const C: () = panic!();
    |                   ^^^^^^^^ evaluation of `Fail::<i32>::C` failed here
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-promoted-const.rs:20:21
+  --> $DIR/collect-in-promoted-const.rs:22: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:27:5
    |
 LL |     f::<i32>();
    |     ^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-promoted-const.rs b/tests/ui/consts/required-consts/collect-in-promoted-const.rs
@@ -1,6 +1,8 @@
 //@revisions: noopt opt
 //@ build-fail
 //@[noopt] compile-flags: -Copt-level=0
+// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
+//@[opt] compile-flags: -C debuginfo=0
 //@[opt] compile-flags: -O
 //! Make sure we error on erroneous consts even if they get promoted.
 
diff --git a/tests/ui/print_type_sizes/async.rs b/tests/ui/print_type_sizes/async.rs
@@ -1,3 +1,5 @@
+// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
+//@ compile-flags: -C debuginfo=0
 //@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type lib
 //@ needs-deterministic-layouts
 //@ edition:2021

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0`
	`2`	`+//@ compile-flags: -C debuginfo=0`
`1`	`3`	`//@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type lib`
`2`	`4`	`//@ needs-deterministic-layouts`
`3`	`5`	`//@ edition:2021`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`	`1`	`error[E0080]: evaluation panicked: explicit panic`
`2`		`- --> $DIR/collect-in-promoted-const.rs:9:19`
	`2`	`+ --> $DIR/collect-in-promoted-const.rs:11:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| const C: () = panic!();`
`5`	`5`	\| ^^^^^^^^ evaluation of `Fail::<i32>::C` failed here
`6`	`6`
`7`	`7`	`note: erroneous constant encountered`
`8`		`- --> $DIR/collect-in-promoted-const.rs:20:21`
	`8`	`+ --> $DIR/collect-in-promoted-const.rs:22:21`
`9`	`9`	`\|`
`10`	`10`	`LL \| let _val = &Fail::<T>::C;`
`11`	`11`	`\| ^^^^^^^^^^^^`
`12`	`12`
`13`	`13`	note: the above error was encountered while instantiating `fn f::<i32>`
`14`		`- --> $DIR/collect-in-promoted-const.rs:25:5`
	`14`	`+ --> $DIR/collect-in-promoted-const.rs:27:5`
`15`	`15`	`\|`
`16`	`16`	`LL \| f::<i32>();`
`17`	`17`	`\| ^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,31 +1,31 @@`
`1`	`1`	`error[E0080]: evaluation panicked: explicit panic`
`2`		`- --> $DIR/collect-in-promoted-const.rs:9:19`
	`2`	`+ --> $DIR/collect-in-promoted-const.rs:11:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| const C: () = panic!();`
`5`	`5`	\| ^^^^^^^^ evaluation of `Fail::<T>::C` failed here
`6`	`6`
`7`	`7`	`note: erroneous constant encountered`
`8`		`- --> $DIR/collect-in-promoted-const.rs:20:21`
	`8`	`+ --> $DIR/collect-in-promoted-const.rs:22:21`
`9`	`9`	`\|`
`10`	`10`	`LL \| let _val = &Fail::<T>::C;`
`11`	`11`	`\| ^^^^^^^^^^^^`
`12`	`12`
`13`	`13`	`error[E0080]: evaluation panicked: explicit panic`
`14`		`- --> $DIR/collect-in-promoted-const.rs:9:19`
	`14`	`+ --> $DIR/collect-in-promoted-const.rs:11:19`
`15`	`15`	`\|`
`16`	`16`	`LL \| const C: () = panic!();`
`17`	`17`	\| ^^^^^^^^ evaluation of `Fail::<i32>::C` failed here
`18`	`18`
`19`	`19`	`note: erroneous constant encountered`
`20`		`- --> $DIR/collect-in-promoted-const.rs:20:21`
	`20`	`+ --> $DIR/collect-in-promoted-const.rs:22:21`
`21`	`21`	`\|`
`22`	`22`	`LL \| let _val = &Fail::<T>::C;`
`23`	`23`	`\| ^^^^^^^^^^^^`
`24`	`24`	`\|`
`25`	`25`	= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
`26`	`26`
`27`	`27`	note: the above error was encountered while instantiating `fn f::<i32>`
`28`		`- --> $DIR/collect-in-promoted-const.rs:25:5`
	`28`	`+ --> $DIR/collect-in-promoted-const.rs:27:5`
`29`	`29`	`\|`
`30`	`30`	`LL \| f::<i32>();`
`31`	`31`	`\| ^^^^^^^^^^`