bless

BoxyUwU · BoxyUwU · commit 1b20e4885e44 · 2025-03-13T10:37:46.000Z
diff --git a/tests/ui/const-generics/backcompat/impossible_preds_repeat_expr_hack.rs b/tests/ui/const-generics/backcompat/impossible_preds_repeat_expr_hack.rs
@@ -25,8 +25,7 @@ where
     let _a: [(); 1] = [(); <u8 as Trait<()>>::ASSOC];
     //~^ WARN: cannot use constants which depend on trivially-false where clauses
     //~| WARN: this was previously accepted by the compiler
-    //~^^^ WARN: cannot use constants which depend on trivially-false where clauses
-    //~| WARN: this was previously accepted by the compiler
+    //~^^^ ERROR: mismatched types
 }
 
 struct Foo<const N: usize>;
diff --git a/tests/ui/const-generics/backcompat/impossible_preds_repeat_expr_hack.stderr b/tests/ui/const-generics/backcompat/impossible_preds_repeat_expr_hack.stderr
@@ -8,18 +8,16 @@ LL |     let _a: [(); 1] = [(); <u8 as Trait<()>>::ASSOC];
    = note: for more information, see issue #76200 <https://github.com/rust-lang/rust/issues/76200>
    = note: `#[warn(const_evaluatable_unchecked)]` on by default
 
-warning: cannot use constants which depend on trivially-false where clauses
-  --> $DIR/impossible_preds_repeat_expr_hack.rs:25:28
+error[E0308]: mismatched types
+  --> $DIR/impossible_preds_repeat_expr_hack.rs:25:23
    |
 LL |     let _a: [(); 1] = [(); <u8 as Trait<()>>::ASSOC];
-   |                            ^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #76200 <https://github.com/rust-lang/rust/issues/76200>
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+   |             -------   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected an array with a size of 1, found one with a size of <u8 as Trait<()>>::ASSOC
+   |             |
+   |             expected due to this
 
 error[E0277]: the trait bound `for<'a> (): Unimplemented<'a>` is not satisfied
-  --> $DIR/impossible_preds_repeat_expr_hack.rs:38:43
+  --> $DIR/impossible_preds_repeat_expr_hack.rs:37:43
    |
 LL |     let _a: Foo<1> = Foo::<{ <u8 as Trait<()>>::ASSOC }>;
    |                                           ^^ the trait `for<'a> Unimplemented<'a>` is not implemented for `()`
@@ -39,7 +37,7 @@ LL |     const ASSOC: usize;
    |           ----- required by a bound in this associated constant
 
 error[E0277]: the trait bound `for<'a> (): Unimplemented<'a>` is not satisfied
-  --> $DIR/impossible_preds_repeat_expr_hack.rs:38:31
+  --> $DIR/impossible_preds_repeat_expr_hack.rs:37:31
    |
 LL |     let _a: Foo<1> = Foo::<{ <u8 as Trait<()>>::ASSOC }>;
    |                               ^^ the trait `for<'a> Unimplemented<'a>` is not implemented for `()`
@@ -58,6 +56,7 @@ LL | where
 LL |     for<'a> T: Unimplemented<'a>,
    |                ----------------- unsatisfied trait bound introduced here
 
-error: aborting due to 2 previous errors; 2 warnings emitted
+error: aborting due to 3 previous errors; 1 warning emitted
 
-For more information about this error, try `rustc --explain E0277`.
+Some errors have detailed explanations: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/tests/ui/const-generics/generic_const_exprs/cross-crate-2.rs b/tests/ui/const-generics/generic_const_exprs/cross-crate-2.rs
@@ -1,10 +1,10 @@
+//@ check-pass
 //@ aux-build: cross-crate-2.rs
 
 extern crate cross_crate_2;
 
 use cross_crate_2::Foo;
 
 fn main() {
-    // There is an error in the aux crate but there is no way to annotate this
     Foo::<7>::new();
 }
diff --git a/tests/ui/const-generics/generic_const_exprs/cross-crate-2.stderr b/tests/ui/const-generics/generic_const_exprs/cross-crate-2.stderr
diff --git a/tests/ui/generic-const-items/trivially-unsatisfied-bounds-0.rs b/tests/ui/generic-const-items/trivially-unsatisfied-bounds-0.rs
@@ -3,7 +3,7 @@
 
 // Ensure that we check if trivial bounds on const items hold or not.
 
-const UNUSABLE: () = () //~ ERROR evaluation of constant value failed
+const UNUSABLE: () = ()
 where
     String: Copy;
 
diff --git a/tests/ui/generic-const-items/trivially-unsatisfied-bounds-0.stderr b/tests/ui/generic-const-items/trivially-unsatisfied-bounds-0.stderr
@@ -1,11 +1,3 @@
-error[E0080]: evaluation of constant value failed
-  --> $DIR/trivially-unsatisfied-bounds-0.rs:6:1
-   |
-LL | / const UNUSABLE: () = ()
-LL | | where
-LL | |     String: Copy;
-   | |_________________^ entering unreachable code
-
 error[E0277]: the trait bound `String: Copy` is not satisfied
   --> $DIR/trivially-unsatisfied-bounds-0.rs:11:13
    |
@@ -21,7 +13,6 @@ LL | where
 LL |     String: Copy;
    |             ^^^^ required by this bound in `UNUSABLE`
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-Some errors have detailed explanations: E0080, E0277.
-For more information about an error, try `rustc --explain E0080`.
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/generic-const-items/trivially-unsatisfied-bounds-1.rs b/tests/ui/generic-const-items/trivially-unsatisfied-bounds-1.rs
@@ -1,12 +1,10 @@
+//@ check-pass
+
 #![feature(generic_const_items, trivial_bounds)]
 #![allow(incomplete_features, dead_code, trivial_bounds)]
 
-// FIXME(generic_const_items): This looks like a bug to me. I expected that we wouldn't emit any
-// errors. I thought we'd skip the evaluation of consts whose bounds don't hold.
-
 const UNUSED: () = ()
 where
     String: Copy;
-//~^^^ ERROR evaluation of constant value failed
 
 fn main() {}
diff --git a/tests/ui/generic-const-items/trivially-unsatisfied-bounds-1.stderr b/tests/ui/generic-const-items/trivially-unsatisfied-bounds-1.stderr
diff --git a/tests/ui/layout/uncomputable-due-to-trivial-bounds-ice-135138.rs b/tests/ui/layout/uncomputable-due-to-trivial-bounds-ice-135138.rs
@@ -6,9 +6,7 @@ where
 {
     [(); { let _a: Option<str> = None; 0 }];
     //~^ ERROR evaluation of constant value failed
-        //~^^ WARN cannot use constants which depend on trivially-false where clauses
-    //~| WARN this was previously accepted by the compiler but is being phased out
-    //~^^^^ WARN cannot use constants which depend on trivially-false where clauses
+    //~^^ WARN cannot use constants which depend on trivially-false where clauses
     //~| WARN this was previously accepted by the compiler but is being phased out
 }
 
diff --git a/tests/ui/layout/uncomputable-due-to-trivial-bounds-ice-135138.stderr b/tests/ui/layout/uncomputable-due-to-trivial-bounds-ice-135138.stderr
@@ -14,16 +14,6 @@ error[E0080]: evaluation of constant value failed
 LL |     [(); { let _a: Option<str> = None; 0 }];
    |                ^^ the type `Option<str>` has an unknown layout
 
-warning: cannot use constants which depend on trivially-false where clauses
-  --> $DIR/uncomputable-due-to-trivial-bounds-ice-135138.rs:7:10
-   |
-LL |     [(); { let _a: Option<str> = None; 0 }];
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #76200 <https://github.com/rust-lang/rust/issues/76200>
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-
-error: aborting due to 1 previous error; 2 warnings emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/layout/unknown-when-no-type-parameter.stderr b/tests/ui/layout/unknown-when-no-type-parameter.stderr
@@ -17,16 +17,6 @@ LL |     [(); size_of::<<() as Project>::Assoc>()];
 note: inside `std::mem::size_of::<<() as Project>::Assoc>`
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
 
-warning: cannot use constants which depend on trivially-false where clauses
-  --> $DIR/unknown-when-no-type-parameter.rs:11:10
-   |
-LL |     [(); size_of::<<() as Project>::Assoc>()];
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #76200 <https://github.com/rust-lang/rust/issues/76200>
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-
-error: aborting due to 1 previous error; 2 warnings emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/layout/unknown-when-ptr-metadata-is-DST.rs b/tests/ui/layout/unknown-when-ptr-metadata-is-DST.rs
@@ -9,8 +9,6 @@ where
     //~^ ERROR evaluation of constant value failed
     //~^^ WARN cannot use constants which depend on trivially-false where clauses
     //~| WARN this was previously accepted by the compiler but is being phased out
-    //~^^^^ WARN cannot use constants which depend on trivially-false where clauses
-    //~| WARN this was previously accepted by the compiler but is being phased out
 }
 
 fn main() {}
diff --git a/tests/ui/layout/unknown-when-ptr-metadata-is-DST.stderr b/tests/ui/layout/unknown-when-ptr-metadata-is-DST.stderr
@@ -14,16 +14,6 @@ error[E0080]: evaluation of constant value failed
 LL |     [(); { let _a: Option<&str> = None; 0 }];
    |                ^^ the type `str` has an unknown layout
 
-warning: cannot use constants which depend on trivially-false where clauses
-  --> $DIR/unknown-when-ptr-metadata-is-DST.rs:8:10
-   |
-LL |     [(); { let _a: Option<&str> = None; 0 }];
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #76200 <https://github.com/rust-lang/rust/issues/76200>
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-
-error: aborting due to 1 previous error; 2 warnings emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/match/impossible_preds_const_pattern.rs b/tests/ui/match/impossible_preds_const_pattern.rs
@@ -25,20 +25,22 @@ trait Global {
 
 impl Global for () {
     const ASSOC: usize = 0
-    //~^ ERROR: evaluation of constant value failed
     where
         for<'a> (): Unimplemented<'a>;
 }
 
-fn works(x: usize)
+fn also_errors(x: usize)
 where
     for<'a> (): Unimplemented<'a>,
 {
     // In order for match exhaustiveness to determine this match is OK, CTFE must
     // be able to evalaute `<() as Trait>::ASSOC` which depends on a trivially
     // false bound for well formedness.
+    //
+    // This used to succeed but now errors
     match x {
         <() as Trait<()>>::ASSOC => todo!(),
+        //~^ ERROR: constant pattern cannot depend on generic parameters
         1.. => todo!(),
     }
 }
@@ -47,10 +49,11 @@ fn errors(x: usize)
 where
     for<'a> (): Unimplemented<'a>,
 {
-    // This errors due to the MIR for `ASSOC` being empty due to the
-    // globally false bound.
+    // This previously would error due to the MIR for `ASSOC` being empty
+    // due to the globally false bound.
     match x {
         <() as Global>::ASSOC => todo!(),
+        //~^ ERROR: constant pattern cannot depend on generic parameters
         1.. => todo!(),
     }
 }
diff --git a/tests/ui/match/impossible_preds_const_pattern.stderr b/tests/ui/match/impossible_preds_const_pattern.stderr
@@ -1,12 +1,26 @@
-error[E0080]: evaluation of constant value failed
-  --> $DIR/impossible_preds_const_pattern.rs:27:5
+error[E0158]: constant pattern cannot depend on generic parameters
+  --> $DIR/impossible_preds_const_pattern.rs:42:9
    |
-LL | /     const ASSOC: usize = 0
-LL | |
-LL | |     where
-LL | |         for<'a> (): Unimplemented<'a>;
-   | |______________________________________^ entering unreachable code
+LL | trait Trait<T>
+   | --------------
+...
+LL |     const ASSOC: usize;
+   |     ------------------ constant defined here
+...
+LL |         <() as Trait<()>>::ASSOC => todo!(),
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^ `const` depends on a generic parameter
 
-error: aborting due to 1 previous error
+error[E0158]: constant pattern cannot depend on generic parameters
+  --> $DIR/impossible_preds_const_pattern.rs:55:9
+   |
+LL | trait Global {
+   | ------------
+LL |     const ASSOC: usize
+   |     ------------------ constant defined here
+...
+LL |         <() as Global>::ASSOC => todo!(),
+   |         ^^^^^^^^^^^^^^^^^^^^^ `const` depends on a generic parameter
+
+error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0080`.
+For more information about this error, try `rustc --explain E0158`.

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ where`
`25`	`25`	`let _a: [(); 1] = [(); <u8 as Trait<()>>::ASSOC];`
`26`	`26`	`//~^ WARN: cannot use constants which depend on trivially-false where clauses`
`27`	`27`	`//~\| WARN: this was previously accepted by the compiler`
`28`		`- //~^^^ WARN: cannot use constants which depend on trivially-false where clauses`
`29`		`- //~\| WARN: this was previously accepted by the compiler`
	`28`	`+ //~^^^ ERROR: mismatched types`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`struct Foo<const N: usize>;`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
	`1`	`+//@ check-pass`
`1`	`2`	`//@ aux-build: cross-crate-2.rs`
`2`	`3`
`3`	`4`	`extern crate cross_crate_2;`
`4`	`5`
`5`	`6`	`use cross_crate_2::Foo;`
`6`	`7`
`7`	`8`	`fn main() {`
`8`		`- // There is an error in the aux crate but there is no way to annotate this`
`9`	`9`	`Foo::<7>::new();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,7 @@ where`
`6`	`6`	`{`
`7`	`7`	`[(); { let _a: Option<str> = None; 0 }];`
`8`	`8`	`//~^ ERROR evaluation of constant value failed`
`9`		`- //~^^ WARN cannot use constants which depend on trivially-false where clauses`
`10`		`- //~\| WARN this was previously accepted by the compiler but is being phased out`
`11`		`- //~^^^^ WARN cannot use constants which depend on trivially-false where clauses`
	`9`	`+ //~^^ WARN cannot use constants which depend on trivially-false where clauses`
`12`	`10`	`//~\| WARN this was previously accepted by the compiler but is being phased out`
`13`	`11`	`}`
`14`	`12`