user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #148928 - WaffleLapkin:always-test, r=jieyouxu

Browse source 
Move & adjust some `!`-adjacent tests

I'm trying to clean up tests relating to the never type...
This commit is contained in:
Stuart Cook 2025-11-14 13:14:10 +11:00 • committed by GitHub
commit 1c32a0b6bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/mir-opt/uninhabited_enum.rs
View file

@ -1,4 +1,7 @@
// skip-filecheck
//
// check that we mark blocks with `!` locals as unreachable.
// (and currently don't do the same for other uninhabited types)
#![feature(never_type)]
#[derive(Copy, Clone)]

2
tests/mir-opt/uninhabited_not_read.rs
View file

@ -1,7 +1,7 @@
// skip-filecheck
//@ edition: 2021
// In ed 2021 and below, we don't fallback `!` to `()`.
// In ed 2021 and below, we fallback `!` to `()`.
// This would introduce a `! -> ()` coercion which would
// be UB if we didn't disallow this explicitly.

4
tests/ui/coercion/coerce-loop-issue-122561.rs
View file

@ -1,4 +1,6 @@
// Regression test for #122561
// Regression test for <https://github.com/rust-lang/rust/issues/122561>.
//
// Tests suggestions for type mismatch of loop expressions.
fn for_infinite() -> bool {
for i in 0.. {

32
tests/ui/coercion/coerce-loop-issue-122561.stderr
View file

@ -1,5 +1,5 @@
warning: denote infinite loops with `loop { ... }`
--> $DIR/coerce-loop-issue-122561.rs:47:5
--> $DIR/coerce-loop-issue-122561.rs:49:5
|
LL | while true {
| ^^^^^^^^^^ help: use `loop`
@ -7,13 +7,13 @@ LL | while true {
= note: `#[warn(while_true)]` on by default
warning: denote infinite loops with `loop { ... }`
--> $DIR/coerce-loop-issue-122561.rs:71:5
--> $DIR/coerce-loop-issue-122561.rs:73:5
|
LL | while true {
| ^^^^^^^^^^ help: use `loop`
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:41:24
--> $DIR/coerce-loop-issue-122561.rs:43:24
|
LL | fn for_in_arg(a: &[(); for x in 0..2 {}]) -> bool {
| ^^^^^^^^^^^^^^^^ expected `usize`, found `()`
@ -25,7 +25,7 @@ LL | fn for_in_arg(a: &[(); for x in 0..2 {} /* `usize` value */]) -> bool {
| +++++++++++++++++++
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:4:5
--> $DIR/coerce-loop-issue-122561.rs:6:5
|
LL | fn for_infinite() -> bool {
| ---- expected `bool` because of return type
@ -43,7 +43,7 @@ LL + /* `bool` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:11:5
--> $DIR/coerce-loop-issue-122561.rs:13:5
|
LL | fn for_finite() -> String {
| ------ expected `String` because of return type
@ -61,7 +61,7 @@ LL + /* `String` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:18:5
--> $DIR/coerce-loop-issue-122561.rs:20:5
|
LL | fn for_zero_times() -> bool {
| ---- expected `bool` because of return type
@ -79,7 +79,7 @@ LL + /* `bool` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:25:5
--> $DIR/coerce-loop-issue-122561.rs:27:5
|
LL | fn for_never_type() -> ! {
| - expected `!` because of return type
@ -98,7 +98,7 @@ LL + /* `loop {}` or `panic!("...")` */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:33:32
--> $DIR/coerce-loop-issue-122561.rs:35:32
|
LL | fn for_single_line() -> bool { for i in 0.. { return false; } }
| ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found `()`
@ -112,7 +112,7 @@ LL | fn for_single_line() -> bool { for i in 0.. { return false; } /* `bool` val
| ++++++++++++++++++
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:47:5
--> $DIR/coerce-loop-issue-122561.rs:49:5
|
LL | fn while_inifinite() -> bool {
| ---- expected `bool` because of return type
@ -131,7 +131,7 @@ LL + /* `bool` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:56:5
--> $DIR/coerce-loop-issue-122561.rs:58:5
|
LL | fn while_finite() -> bool {
| ---- expected `bool` because of return type
@ -151,7 +151,7 @@ LL + /* `bool` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:64:5
--> $DIR/coerce-loop-issue-122561.rs:66:5
|
LL | fn while_zero_times() -> bool {
| ---- expected `bool` because of return type
@ -169,7 +169,7 @@ LL + /* `bool` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:71:5
--> $DIR/coerce-loop-issue-122561.rs:73:5
|
LL | fn while_never_type() -> ! {
| - expected `!` because of return type
@ -188,7 +188,7 @@ LL + /* `loop {}` or `panic!("...")` */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:85:5
--> $DIR/coerce-loop-issue-122561.rs:87:5
|
LL | / for i in 0.. {
LL | |
@ -203,7 +203,7 @@ LL + /* `i32` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:92:9
--> $DIR/coerce-loop-issue-122561.rs:94:9
|
LL | / for i in 0..5 {
LL | |
@ -218,7 +218,7 @@ LL + /* `usize` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:98:9
--> $DIR/coerce-loop-issue-122561.rs:100:9
|
LL | / while false {
LL | |
@ -233,7 +233,7 @@ LL + /* `usize` value */
|
error[E0308]: mismatched types
--> $DIR/coerce-loop-issue-122561.rs:104:23
--> $DIR/coerce-loop-issue-122561.rs:106:23
|
LL | let _ = |a: &[(); for x in 0..2 {}]| {};
| ^^^^^^^^^^^^^^^^ expected `usize`, found `()`

2
tests/ui/consts/const-eval/raw-bytes.rs
View file

@ -34,7 +34,7 @@ const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
#[derive(Copy, Clone)]
enum Never {}
// An enum with 3 variants of which some are uninhabited -- so the uninhabited variants *do*
// An enum with 4 variants of which only some are uninhabited -- so the uninhabited variants *do*
// have a discriminant.
enum UninhDiscriminant {
A,

10
tests/ui/consts/let-irrefutable-pattern-ice-120337.rs
View file

@ -1,10 +1,18 @@
// Regression test for <https://github.com/rust-lang/rust/issues/120337>.
//
// This checks that const eval doesn't cause an ICE when reading an uninhabited
// variant. (N.B. this is UB, but not currently detected by rustc)
//
//@ check-pass
#![feature(never_type)]
#[derive(Copy, Clone)]
pub enum E { A(!), }
pub union U { u: (), e: E, }
pub const C: () = {
let E::A(ref a) = unsafe { &(&U { u: () }).e};
let E::A(ref a) = unsafe { &(&U { u: () }).e };
};
fn main() {}

0
tests/ui/never_type/dispatch_from_dyn_zst.rs → tests/ui/self/dispatch_from_dyn_zst.rs
View file