Bless tests

camsteffen · camsteffen · commit 11034e411a22 · 2022-10-23T18:06:37.000-05:00
diff --git a/src/test/mir-opt/const_prop/invalid_constant.main.ConstProp.diff b/src/test/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
@@ -3,23 +3,24 @@
   
   fn main() -> () {
       let mut _0: ();                      // return place in scope 0 at $DIR/invalid_constant.rs:+0:11: +0:11
-      let _1: char;                        // in scope 0 at $DIR/invalid_constant.rs:+6:9: +6:22
-      let mut _2: main::InvalidChar;       // in scope 0 at $DIR/invalid_constant.rs:+6:34: +6:63
-      let mut _4: E;                       // in scope 0 at $DIR/invalid_constant.rs:+13:25: +13:59
-      let mut _5: main::InvalidTag;        // in scope 0 at $DIR/invalid_constant.rs:+13:34: +13:55
-      let mut _7: Empty;                   // in scope 0 at $DIR/invalid_constant.rs:+20:35: +20:73
-      let mut _8: main::NoVariants;        // in scope 0 at $DIR/invalid_constant.rs:+20:44: +20:65
+      let mut _1: !;                       // in scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
+      let _2: char;                        // in scope 0 at $DIR/invalid_constant.rs:+6:9: +6:22
+      let mut _3: main::InvalidChar;       // in scope 0 at $DIR/invalid_constant.rs:+6:34: +6:63
+      let mut _5: E;                       // in scope 0 at $DIR/invalid_constant.rs:+13:25: +13:59
+      let mut _6: main::InvalidTag;        // in scope 0 at $DIR/invalid_constant.rs:+13:34: +13:55
+      let mut _8: Empty;                   // in scope 0 at $DIR/invalid_constant.rs:+20:35: +20:73
+      let mut _9: main::NoVariants;        // in scope 0 at $DIR/invalid_constant.rs:+20:44: +20:65
       scope 1 {
-          debug _invalid_char => _1;       // in scope 1 at $DIR/invalid_constant.rs:+6:9: +6:22
-          let _3: [E; 1];                  // in scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
+          debug _invalid_char => _2;       // in scope 1 at $DIR/invalid_constant.rs:+6:9: +6:22
+          let _4: [E; 1];                  // in scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
           scope 3 {
-              debug _invalid_tag => _3;    // in scope 3 at $DIR/invalid_constant.rs:+13:9: +13:21
-              let _6: [Empty; 1];          // in scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
+              debug _invalid_tag => _4;    // in scope 3 at $DIR/invalid_constant.rs:+13:9: +13:21
+              let _7: [Empty; 1];          // in scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
               scope 5 {
-                  debug _enum_without_variants => _6; // in scope 5 at $DIR/invalid_constant.rs:+20:9: +20:31
-                  let _9: main::Str<"���">; // in scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
+                  debug _enum_without_variants => _7; // in scope 5 at $DIR/invalid_constant.rs:+20:9: +20:31
+                  let _10: main::Str<"���">; // in scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
                   scope 7 {
-                      debug _non_utf8_str => _9; // in scope 7 at $DIR/invalid_constant.rs:+24:9: +24:22
+                      debug _non_utf8_str => _10; // in scope 7 at $DIR/invalid_constant.rs:+24:9: +24:22
                   }
               }
               scope 6 {
@@ -32,46 +33,7 @@
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/invalid_constant.rs:+6:9: +6:22
-          StorageLive(_2);                 // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
-          Deinit(_2);                      // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
-          (_2.0: u32) = const 1114113_u32; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
--         _1 = (_2.1: char);               // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:67
-+         _1 = const {transmute(0x00110001): char}; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:67
-          StorageDead(_2);                 // scope 0 at $DIR/invalid_constant.rs:+6:69: +6:70
-          StorageLive(_3);                 // scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
-          StorageLive(_4);                 // scope 1 at $DIR/invalid_constant.rs:+13:25: +13:59
-          StorageLive(_5);                 // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
-          Deinit(_5);                      // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
-          (_5.0: u32) = const 4_u32;       // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
--         _4 = (_5.1: E);                  // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:57
--         _3 = [move _4];                  // scope 1 at $DIR/invalid_constant.rs:+13:24: +13:60
-+         _4 = const Scalar(0x00000004): E; // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:57
-+                                          // mir::Constant
-+                                          // + span: $DIR/invalid_constant.rs:28:34: 28:57
-+                                          // + literal: Const { ty: E, val: Value(Scalar(0x00000004)) }
-+         _3 = [const Scalar(0x00000004): E]; // scope 1 at $DIR/invalid_constant.rs:+13:24: +13:60
-+                                          // mir::Constant
-+                                          // + span: $DIR/invalid_constant.rs:28:24: 28:60
-+                                          // + literal: Const { ty: E, val: Value(Scalar(0x00000004)) }
-          StorageDead(_4);                 // scope 1 at $DIR/invalid_constant.rs:+13:59: +13:60
-          StorageDead(_5);                 // scope 1 at $DIR/invalid_constant.rs:+13:60: +13:61
-          StorageLive(_6);                 // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
-          StorageLive(_7);                 // scope 3 at $DIR/invalid_constant.rs:+20:35: +20:73
-          StorageLive(_8);                 // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          Deinit(_8);                      // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          (_8.0: u32) = const 0_u32;       // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          nop;                             // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:71
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+20:34: +20:74
-          StorageDead(_7);                 // scope 3 at $DIR/invalid_constant.rs:+20:73: +20:74
-          StorageDead(_8);                 // scope 3 at $DIR/invalid_constant.rs:+20:74: +20:75
-          StorageLive(_9);                 // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
-          nop;                             // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
-          StorageDead(_9);                 // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
-          StorageDead(_6);                 // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
-          StorageDead(_3);                 // scope 1 at $DIR/invalid_constant.rs:+27:1: +27:2
-          StorageDead(_1);                 // scope 0 at $DIR/invalid_constant.rs:+27:1: +27:2
-          return;                          // scope 0 at $DIR/invalid_constant.rs:+27:2: +27:2
+          unreachable;                     // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
       }
   }
   
diff --git a/src/test/mir-opt/uninhabited_enum.process_void.SimplifyLocals.after.mir b/src/test/mir-opt/uninhabited_enum.process_void.SimplifyLocals.after.mir
@@ -11,8 +11,6 @@ fn process_void(_1: *const Void) -> () {
     }
 
     bb0: {
-        StorageLive(_2);                 // scope 0 at $DIR/uninhabited-enum.rs:+1:8: +1:14
-        StorageDead(_2);                 // scope 0 at $DIR/uninhabited-enum.rs:+4:1: +4:2
-        return;                          // scope 0 at $DIR/uninhabited-enum.rs:+4:2: +4:2
+        unreachable;                     // scope 0 at $DIR/uninhabited-enum.rs:+0:41: +4:2
     }
 }
diff --git a/src/test/ui/break-diverging-value.rs b/src/test/ui/break-diverging-value.rs
@@ -22,8 +22,8 @@ fn get_void() -> Void {
     panic!()
 }
 
-fn loop_break_void() -> i32 { //~ ERROR mismatched types
-    let loop_value = loop { break get_void() };
+fn loop_break_void() -> i32 {
+    let loop_value = loop { break get_void() }; // ok
 }
 
 fn get_never() -> ! {
diff --git a/src/test/ui/break-diverging-value.stderr b/src/test/ui/break-diverging-value.stderr
@@ -6,14 +6,6 @@ LL | fn loop_break_break() -> i32 {
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
 
-error[E0308]: mismatched types
-  --> $DIR/break-diverging-value.rs:25:25
-   |
-LL | fn loop_break_void() -> i32 {
-   |    ---------------      ^^^ expected `i32`, found `()`
-   |    |
-   |    implicitly returns `()` as its body has no tail or `return` expression
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs b/src/test/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
@@ -19,10 +19,10 @@ fn bar() -> Option<Empty> {
 
 fn main() {
     if let Some(x) = bar() {
-        Test1::B(x);
+        Test1::B(x); //~ unreachable call
     }
 
     if let Some(x) = bar() {
-        Test2::B(x);
+        Test2::B(x); //~ unreachable call
     }
 }
diff --git a/src/test/ui/consts/const-eval/write-to-uninhabited-enum-variant.stderr b/src/test/ui/consts/const-eval/write-to-uninhabited-enum-variant.stderr
@@ -0,0 +1,20 @@
+warning: unreachable call
+  --> $DIR/write-to-uninhabited-enum-variant.rs:22:9
+   |
+LL |         Test1::B(x);
+   |         ^^^^^^^^ - this expression has type `Empty`, which is uninhabited
+   |         |
+   |         unreachable call
+   |
+   = note: `#[warn(unreachable_code)]` on by default
+
+warning: unreachable call
+  --> $DIR/write-to-uninhabited-enum-variant.rs:26:9
+   |
+LL |         Test2::B(x);
+   |         ^^^^^^^^ - this expression has type `Empty`, which is uninhabited
+   |         |
+   |         unreachable call
+
+warning: 2 warnings emitted
+
diff --git a/src/test/ui/generator/issue-93161.rs b/src/test/ui/generator/issue-93161.rs
@@ -39,8 +39,8 @@ async fn includes_never(crash: bool, x: u32) -> u32 {
     }
     #[allow(unused)]
     let bad = never();
-    result *= async { x + x }.await;
-    drop(bad);
+    result *= async { x + x }.await; //~ unreachable statement
+    drop(bad); //~ unreachable call
     result
 }
 
diff --git a/src/test/ui/generator/issue-93161.stderr b/src/test/ui/generator/issue-93161.stderr
@@ -0,0 +1,20 @@
+warning: unreachable statement
+  --> $DIR/issue-93161.rs:42:5
+   |
+LL |     let bad = never();
+   |               ------- this expression has type `Never`, which is uninhabited
+LL |     result *= async { x + x }.await;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
+   |
+   = note: `#[warn(unreachable_code)]` on by default
+
+warning: unreachable call
+  --> $DIR/issue-93161.rs:43:5
+   |
+LL |     drop(bad);
+   |     ^^^^ --- this expression has type `Never`, which is uninhabited
+   |     |
+   |     unreachable call
+
+warning: 2 warnings emitted
+
diff --git a/src/test/ui/issues/issue-46519.rs b/src/test/ui/issues/issue-46519.rs
@@ -6,7 +6,7 @@
 #[test]
 #[should_panic(expected = "creating inhabited type")]
 fn test() {
-    FontLanguageOverride::system_font(SystemFont::new());
+    FontLanguageOverride::system_font(SystemFont::new()); //~ unreachable call
 }
 
 pub enum FontLanguageOverride {
@@ -19,7 +19,7 @@ pub enum SystemFont {}
 
 impl FontLanguageOverride {
     fn system_font(f: SystemFont) -> Self {
-        FontLanguageOverride::System(f)
+        FontLanguageOverride::System(f) //~ unreachable call
     }
 }
 
diff --git a/src/test/ui/issues/issue-46519.stderr b/src/test/ui/issues/issue-46519.stderr
@@ -0,0 +1,20 @@
+warning: unreachable call
+  --> $DIR/issue-46519.rs:9:5
+   |
+LL |     FontLanguageOverride::system_font(SystemFont::new());
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ----------------- this expression has type `SystemFont`, which is uninhabited
+   |     |
+   |     unreachable call
+   |
+   = note: `#[warn(unreachable_code)]` on by default
+
+warning: unreachable call
+  --> $DIR/issue-46519.rs:22:9
+   |
+LL |         FontLanguageOverride::System(f)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - this expression has type `SystemFont`, which is uninhabited
+   |         |
+   |         unreachable call
+
+warning: 2 warnings emitted
+
diff --git a/src/test/ui/issues/issue-46855.rs b/src/test/ui/issues/issue-46855.rs
@@ -12,7 +12,7 @@ union Foo {
     b: Never
 }
 
-fn foo(xs: [(Never, u32); 1]) -> u32 { xs[0].1 }
+fn foo(xs: [(Never, u32); 1]) -> u32 { xs[0].1 } //~ unreachable expression
 
 fn bar([(_, x)]: [(Never, u32); 1]) -> u32 { x }
 
diff --git a/src/test/ui/issues/issue-46855.stderr b/src/test/ui/issues/issue-46855.stderr
@@ -0,0 +1,12 @@
+warning: unreachable expression
+  --> $DIR/issue-46855.rs:15:43
+   |
+LL | fn foo(xs: [(Never, u32); 1]) -> u32 { xs[0].1 }
+   |                                        -- ^ unreachable expression
+   |                                        |
+   |                                        this expression has type `[(Never, u32); 1]`, which is uninhabited
+   |
+   = note: `#[warn(unreachable_code)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/src/test/ui/lint/dead-code/issue-85071-2.rs b/src/test/ui/lint/dead-code/issue-85071-2.rs
@@ -18,5 +18,5 @@ fn main() {
     let x = s.f();
     //~^ WARNING: unused variable: `x`
     let _y = x;
-    //~^ WARNING: unreachable definition
+    //~^ WARNING: unreachable statement
 }
diff --git a/src/test/ui/lint/dead-code/issue-85071-2.stderr b/src/test/ui/lint/dead-code/issue-85071-2.stderr
@@ -1,17 +1,12 @@
-warning: unreachable definition
-  --> $DIR/issue-85071-2.rs:20:9
+warning: unreachable statement
+  --> $DIR/issue-85071-2.rs:20:5
    |
 LL |     let x = s.f();
-   |             ----- any code following this expression is unreachable
+   |             ----- this expression has type `Foo`, which is uninhabited
 LL |
 LL |     let _y = x;
-   |         ^^ unreachable definition
+   |     ^^^^^^^^^^^ unreachable statement
    |
-note: this expression has type `Foo`, which is uninhabited
-  --> $DIR/issue-85071-2.rs:18:13
-   |
-LL |     let x = s.f();
-   |             ^^^^^
 note: the lint level is defined here
   --> $DIR/issue-85071-2.rs:7:26
    |
diff --git a/src/test/ui/lint/dead-code/issue-85071.rs b/src/test/ui/lint/dead-code/issue-85071.rs
@@ -15,5 +15,5 @@ fn main() {
     let x = f();
     //~^ WARNING: unused variable: `x`
     let _ = x;
-    //~^ WARNING: unreachable expression
+    //~^ WARNING: unreachable statement
 }
diff --git a/src/test/ui/lint/dead-code/issue-85071.stderr b/src/test/ui/lint/dead-code/issue-85071.stderr
@@ -1,17 +1,12 @@
-warning: unreachable expression
-  --> $DIR/issue-85071.rs:17:13
+warning: unreachable statement
+  --> $DIR/issue-85071.rs:17:5
    |
 LL |     let x = f();
-   |             --- any code following this expression is unreachable
+   |             --- this expression has type `Foo`, which is uninhabited
 LL |
 LL |     let _ = x;
-   |             ^ unreachable expression
+   |     ^^^^^^^^^^ unreachable statement
    |
-note: this expression has type `Foo`, which is uninhabited
-  --> $DIR/issue-85071.rs:15:13
-   |
-LL |     let x = f();
-   |             ^^^
 note: the lint level is defined here
   --> $DIR/issue-85071.rs:9:26
    |
diff --git a/src/test/ui/match/match-no-arms-unreachable-after.stderr b/src/test/ui/match/match-no-arms-unreachable-after.stderr
@@ -2,7 +2,7 @@ error: unreachable statement
   --> $DIR/match-no-arms-unreachable-after.rs:8:5
    |
 LL |     match v { }
-   |     ----------- any code following this expression is unreachable
+   |           - this expression has type `Void`, which is uninhabited
 LL |     let x = 2;
    |     ^^^^^^^^^^ unreachable statement
    |
diff --git a/src/test/ui/reachable/unreachable-try-pattern.rs b/src/test/ui/reachable/unreachable-try-pattern.rs
@@ -27,8 +27,11 @@ fn qux(x: Result<u32, Void>) -> Result<u32, i32> {
 }
 
 fn vom(x: Result<u32, Void>) -> Result<u32, i32> {
-    let y = (match x { Ok(n) => Ok(n), Err(e) => Err(e) })?;
-    //~^ WARN unreachable pattern
+    let y = (match x {
+        Ok(n) => Ok(n),
+        Err(e) => Err(e) //~  WARN unreachable call
+                         //~| WARN unreachable pattern
+    })?;
     Ok(y)
 }
 
diff --git a/src/test/ui/reachable/unreachable-try-pattern.stderr b/src/test/ui/reachable/unreachable-try-pattern.stderr
@@ -13,6 +13,14 @@ note: the lint level is defined here
 LL | #![warn(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
 
+warning: unreachable call
+  --> $DIR/unreachable-try-pattern.rs:32:19
+   |
+LL |         Err(e) => Err(e)
+   |                   ^^^ - this expression has type `Void`, which is uninhabited
+   |                   |
+   |                   unreachable call
+
 warning: unreachable pattern
   --> $DIR/unreachable-try-pattern.rs:19:24
    |
@@ -26,10 +34,10 @@ LL | #![warn(unreachable_patterns)]
    |         ^^^^^^^^^^^^^^^^^^^^
 
 warning: unreachable pattern
-  --> $DIR/unreachable-try-pattern.rs:30:40
+  --> $DIR/unreachable-try-pattern.rs:32:9
    |
-LL |     let y = (match x { Ok(n) => Ok(n), Err(e) => Err(e) })?;
-   |                                        ^^^^^^
+LL |         Err(e) => Err(e)
+   |         ^^^^^^
 
-warning: 3 warnings emitted
+warning: 4 warnings emitted
 

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ fn process_void(_1: *const Void) -> () {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`bb0: {`
`14`		`- StorageLive(_2); // scope 0 at $DIR/uninhabited-enum.rs:+1:8: +1:14`
`15`		`- StorageDead(_2); // scope 0 at $DIR/uninhabited-enum.rs:+4:1: +4:2`
`16`		`- return; // scope 0 at $DIR/uninhabited-enum.rs:+4:2: +4:2`
	`14`	`+ unreachable; // scope 0 at $DIR/uninhabited-enum.rs:+0:41: +4:2`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ fn get_void() -> Void {`
`22`	`22`	`panic!()`
`23`	`23`	`}`
`24`	`24`
`25`		`-fn loop_break_void() -> i32 { //~ ERROR mismatched types`
`26`		`- let loop_value = loop { break get_void() };`
	`25`	`+fn loop_break_void() -> i32 {`
	`26`	`+ let loop_value = loop { break get_void() }; // ok`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`fn get_never() -> ! {`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ fn bar() -> Option<Empty> {`
`19`	`19`
`20`	`20`	`fn main() {`
`21`	`21`	`if let Some(x) = bar() {`
`22`		`- Test1::B(x);`
	`22`	`+ Test1::B(x); //~ unreachable call`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`if let Some(x) = bar() {`
`26`		`- Test2::B(x);`
	`26`	`+ Test2::B(x); //~ unreachable call`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ async fn includes_never(crash: bool, x: u32) -> u32 {`
`39`	`39`	`}`
`40`	`40`	`#[allow(unused)]`
`41`	`41`	`let bad = never();`
`42`		`- result *= async { x + x }.await;`
`43`		`- drop(bad);`
	`42`	`+ result *= async { x + x }.await; //~ unreachable statement`
	`43`	`+ drop(bad); //~ unreachable call`
`44`	`44`	`result`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#[test]`
`7`	`7`	`#[should_panic(expected = "creating inhabited type")]`
`8`	`8`	`fn test() {`
`9`		`- FontLanguageOverride::system_font(SystemFont::new());`
	`9`	`+ FontLanguageOverride::system_font(SystemFont::new()); //~ unreachable call`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`pub enum FontLanguageOverride {`
`@@ -19,7 +19,7 @@ pub enum SystemFont {}`
`19`	`19`
`20`	`20`	`impl FontLanguageOverride {`
`21`	`21`	`fn system_font(f: SystemFont) -> Self {`
`22`		`- FontLanguageOverride::System(f)`
	`22`	`+ FontLanguageOverride::System(f) //~ unreachable call`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`