Rollup merge of #156306 - danieljofficial:move-tests-consts, r=TaKO8Ki

matthiaskrgr · web-flow · commit b2cdfa26e41f · 2026-05-08T20:39:26.000+02:00
Move tests consts Hi I have moved some tests from ui/issues into the fitting ui/consts folder Fixes a part of #133895
diff --git a/tests/ui/consts/arithmetic-expr-in-array-len.rs b/tests/ui/consts/arithmetic-expr-in-array-len.rs
@@ -0,0 +1,7 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/4387
+
+//@ run-pass
+
+pub fn main() {
+    let _foo = [0; 2*4];
+}
diff --git a/tests/ui/consts/assoc-const-with-self-in-trait-object.rs b/tests/ui/consts/assoc-const-with-self-in-trait-object.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/50518
+
 //@ check-pass
 use std::marker::PhantomData;
 
diff --git a/tests/ui/consts/bool-comparison-in-const-array-len.rs b/tests/ui/consts/bool-comparison-in-const-array-len.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/39548
+
 //@ run-pass
 type Array = [(); ((1 < 2) == false) as usize];
 
diff --git a/tests/ui/consts/const-array-oob-in-range-expr.rs b/tests/ui/consts/const-array-oob-in-range-expr.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/33287
+
 //@ build-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/tests/ui/consts/empty-array-index-in-struct-init.rs b/tests/ui/consts/empty-array-index-in-struct-init.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/53275
+
 //@ build-pass
 
 #![crate_type = "lib"]
diff --git a/tests/ui/consts/local-var-in-associated-const.fixed b/tests/ui/consts/local-var-in-associated-const.fixed
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/44239
+
 //@ run-rustfix
 #![allow(dead_code, non_upper_case_globals)]
 fn main() {
diff --git a/tests/ui/consts/local-var-in-associated-const.rs b/tests/ui/consts/local-var-in-associated-const.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/44239
+
 //@ run-rustfix
 #![allow(dead_code, non_upper_case_globals)]
 fn main() {
diff --git a/tests/ui/consts/local-var-in-associated-const.stderr b/tests/ui/consts/local-var-in-associated-const.stderr
@@ -1,5 +1,5 @@
 error[E0435]: attempt to use a non-constant value in a constant
-  --> $DIR/issue-44239.rs:8:26
+  --> $DIR/local-var-in-associated-const.rs:10:26
    |
 LL |         const N: usize = n;
    |                          ^ non-constant value
diff --git a/tests/ui/consts/method-reference-in-const-dyn-fn.rs b/tests/ui/consts/method-reference-in-const-dyn-fn.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/25757
+
 //@ run-pass
 struct Foo {
     a: u32
diff --git a/tests/ui/consts/non-constant-value-in-nested-const.fixed b/tests/ui/consts/non-constant-value-in-nested-const.fixed
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/27433
+
 //@ run-rustfix
 fn main() {
     let foo = 42u32;
diff --git a/tests/ui/consts/non-constant-value-in-nested-const.rs b/tests/ui/consts/non-constant-value-in-nested-const.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/27433
+
 //@ run-rustfix
 fn main() {
     let foo = 42u32;
diff --git a/tests/ui/consts/non-constant-value-in-nested-const.stderr b/tests/ui/consts/non-constant-value-in-nested-const.stderr
@@ -1,5 +1,5 @@
 error[E0435]: attempt to use a non-constant value in a constant
-  --> $DIR/issue-27433.rs:5:23
+  --> $DIR/non-constant-value-in-nested-const.rs:7:23
    |
 LL |     const FOO : u32 = foo;
    |                       ^^^ non-constant value
diff --git a/tests/ui/consts/recursive-const-stack-overflow.rs b/tests/ui/consts/recursive-const-stack-overflow.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/17252
+
 const FOO: usize = FOO; //~ ERROR E0391
 //@ ignore-parallel-frontend query cycle
 fn main() {
diff --git a/tests/ui/consts/recursive-const-stack-overflow.stderr b/tests/ui/consts/recursive-const-stack-overflow.stderr
@@ -1,36 +1,36 @@
 error[E0391]: cycle detected when checking if `FOO` is a trivial const
-  --> $DIR/issue-17252.rs:1:1
+  --> $DIR/recursive-const-stack-overflow.rs:3:1
    |
 LL | const FOO: usize = FOO;
    | ^^^^^^^^^^^^^^^^
    |
 note: ...which requires building MIR for `FOO`...
-  --> $DIR/issue-17252.rs:1:1
+  --> $DIR/recursive-const-stack-overflow.rs:3:1
    |
 LL | const FOO: usize = FOO;
    | ^^^^^^^^^^^^^^^^
    = note: ...which again requires checking if `FOO` is a trivial const, completing the cycle
 note: cycle used when simplifying constant for the type system `FOO`
-  --> $DIR/issue-17252.rs:1:1
+  --> $DIR/recursive-const-stack-overflow.rs:3:1
    |
 LL | const FOO: usize = FOO;
    | ^^^^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error[E0391]: cycle detected when checking if `main::BAR` is a trivial const
-  --> $DIR/issue-17252.rs:6:9
+  --> $DIR/recursive-const-stack-overflow.rs:8:9
    |
 LL |         const BAR: usize = BAR;
    |         ^^^^^^^^^^^^^^^^
    |
 note: ...which requires building MIR for `main::BAR`...
-  --> $DIR/issue-17252.rs:6:9
+  --> $DIR/recursive-const-stack-overflow.rs:8:9
    |
 LL |         const BAR: usize = BAR;
    |         ^^^^^^^^^^^^^^^^
    = note: ...which again requires checking if `main::BAR` is a trivial const, completing the cycle
 note: cycle used when simplifying constant for the type system `main::BAR`
-  --> $DIR/issue-17252.rs:6:9
+  --> $DIR/recursive-const-stack-overflow.rs:8:9
    |
 LL |         const BAR: usize = BAR;
    |         ^^^^^^^^^^^^^^^^
diff --git a/tests/ui/consts/short-circuit-or-with-const-bool.rs b/tests/ui/consts/short-circuit-or-with-const-bool.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/30891
+
 //@ run-pass
 const ERROR_CONST: bool = true;
 
diff --git a/tests/ui/consts/static-lifetime-inference-from-const-array.rs b/tests/ui/consts/static-lifetime-inference-from-const-array.rs
@@ -1,6 +1,6 @@
 //@ run-pass
 #![allow(unused_variables)]
-// Regression test for #40951.
+// Regression test for https://github.com/rust-lang/rust/issues/40951.
 
 const FOO: [&'static str; 1] = ["foo"];
 
diff --git a/tests/ui/consts/static-ref-to-const-array-element.rs b/tests/ui/consts/static-ref-to-const-array-element.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/49955
+
 //@ run-pass
 
 const ALL_THE_NUMS: [u32; 1] = [
diff --git a/tests/ui/issues/issue-4387.rs b/tests/ui/issues/issue-4387.rs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/50518`
	`2`	`+`
`1`	`3`	`//@ check-pass`
`2`	`4`	`use std::marker::PhantomData;`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/39548`
	`2`	`+`
`1`	`3`	`//@ run-pass`
`2`	`4`	`type Array = [(); ((1 < 2) == false) as usize];`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/33287`
	`2`	`+`
`1`	`3`	`//@ build-pass`
`2`	`4`	`#![allow(dead_code)]`
`3`	`5`	`#![allow(unused_variables)]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/44239`
	`2`	`+`
`1`	`3`	`//@ run-rustfix`
`2`	`4`	`#![allow(dead_code, non_upper_case_globals)]`
`3`	`5`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0435]: attempt to use a non-constant value in a constant`
`2`		`- --> $DIR/issue-44239.rs:8:26`
	`2`	`+ --> $DIR/local-var-in-associated-const.rs:10:26`
`3`	`3`	`\|`
`4`	`4`	`LL \| const N: usize = n;`
`5`	`5`	`\| ^ non-constant value`