Merge cfail and ui tests into ui tests

30 files changed, 50 insertions, 49 deletions

diff --git a/src/test/ui/reachable/expr_add.rs b/src/test/ui/reachable/expr_add.rs
index 87d017adf68..dd43c58de6d 100644
--- a/src/test/ui/reachable/expr_add.rs
+++ b/src/test/ui/reachable/expr_add.rs
@@ -24,5 +24,5 @@ impl ops::Add<!> for Foo {
 }
 
 fn main() {
-    let x = Foo + return;
+    let x = Foo + return; //~ ERROR unreachable
 }
diff --git a/src/test/ui/reachable/expr_add.stderr b/src/test/ui/reachable/expr_add.stderr
index 1a2cc252051..4ae286d2fff 100644
--- a/src/test/ui/reachable/expr_add.stderr
+++ b/src/test/ui/reachable/expr_add.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_add.rs:27:13
    |
-27 |     let x = Foo + return;
+27 |     let x = Foo + return; //~ ERROR unreachable
    |             ^^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_array.rs b/src/test/ui/reachable/expr_array.rs
index 00e8be07725..31229668796 100644
--- a/src/test/ui/reachable/expr_array.rs
+++ b/src/test/ui/reachable/expr_array.rs
@@ -17,12 +17,12 @@
 
 fn a() {
     // the `22` is unreachable:
-    let x: [usize; 2] = [return, 22];
+    let x: [usize; 2] = [return, 22]; //~ ERROR unreachable
 }
 
 fn b() {
     // the `array is unreachable:
-    let x: [usize; 2] = [22, return];
+    let x: [usize; 2] = [22, return]; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_array.stderr b/src/test/ui/reachable/expr_array.stderr
index f8dbdb5f8bb..0f64d158503 100644
--- a/src/test/ui/reachable/expr_array.stderr
+++ b/src/test/ui/reachable/expr_array.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_array.rs:20:34
    |
-20 |     let x: [usize; 2] = [return, 22];
+20 |     let x: [usize; 2] = [return, 22]; //~ ERROR unreachable
    |                                  ^^
    |
 note: lint level defined here
@@ -13,7 +13,7 @@ note: lint level defined here
 error: unreachable expression
   --> $DIR/expr_array.rs:25:25
    |
-25 |     let x: [usize; 2] = [22, return];
+25 |     let x: [usize; 2] = [22, return]; //~ ERROR unreachable
    |                         ^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/reachable/expr_assign.rs b/src/test/ui/reachable/expr_assign.rs
index 1b9357013d2..e6fb46a5bac 100644
--- a/src/test/ui/reachable/expr_assign.rs
+++ b/src/test/ui/reachable/expr_assign.rs
@@ -17,7 +17,7 @@
 fn foo() {
     // No error here.
     let x;
-    x = return;
+    x = return; //~ ERROR unreachable
 }
 
 fn bar() {
@@ -27,13 +27,13 @@ fn bar() {
         // Here we consider the `return` unreachable because
         // "evaluating" the `*p` has type `!`. This is somewhat
         // dubious, I suppose.
-        *p = return;
+        *p = return; //~ ERROR unreachable
     }
 }
 
 fn baz() {
     let mut i = 0;
-    *{return; &mut i} = 22;
+    *{return; &mut i} = 22; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_assign.stderr b/src/test/ui/reachable/expr_assign.stderr
index 807f6a1c1d5..42c00d5a8b7 100644
--- a/src/test/ui/reachable/expr_assign.stderr
+++ b/src/test/ui/reachable/expr_assign.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_assign.rs:20:5
    |
-20 |     x = return;
+20 |     x = return; //~ ERROR unreachable
    |     ^^^^^^^^^^
    |
 note: lint level defined here
@@ -13,13 +13,13 @@ note: lint level defined here
 error: unreachable expression
   --> $DIR/expr_assign.rs:30:14
    |
-30 |         *p = return;
+30 |         *p = return; //~ ERROR unreachable
    |              ^^^^^^
 
 error: unreachable expression
   --> $DIR/expr_assign.rs:36:15
    |
-36 |     *{return; &mut i} = 22;
+36 |     *{return; &mut i} = 22; //~ ERROR unreachable
    |               ^^^^^^
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/reachable/expr_block.rs b/src/test/ui/reachable/expr_block.rs
index 093589b4dc8..57b5d3cabce 100644
--- a/src/test/ui/reachable/expr_block.rs
+++ b/src/test/ui/reachable/expr_block.rs
@@ -18,7 +18,7 @@ fn a() {
     // Here the tail expression is considered unreachable:
     let x = {
         return;
-        22
+        22 //~ ERROR unreachable
     };
 }
 
diff --git a/src/test/ui/reachable/expr_block.stderr b/src/test/ui/reachable/expr_block.stderr
index 8a17d4e6278..4c361dc8855 100644
--- a/src/test/ui/reachable/expr_block.stderr
+++ b/src/test/ui/reachable/expr_block.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_block.rs:21:9
    |
-21 |         22
+21 |         22 //~ ERROR unreachable
    |         ^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_box.rs b/src/test/ui/reachable/expr_box.rs
index 6509b608335..ab62cbdf837 100644
--- a/src/test/ui/reachable/expr_box.rs
+++ b/src/test/ui/reachable/expr_box.rs
@@ -13,6 +13,6 @@
 #![deny(unreachable_code)]
 
 fn main() {
-    let x = box return;
+    let x = box return; //~ ERROR unreachable
     println!("hi");
 }
diff --git a/src/test/ui/reachable/expr_box.stderr b/src/test/ui/reachable/expr_box.stderr
index 78ba231cef9..d8b5d9f8d76 100644
--- a/src/test/ui/reachable/expr_box.stderr
+++ b/src/test/ui/reachable/expr_box.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_box.rs:16:13
    |
-16 |     let x = box return;
+16 |     let x = box return; //~ ERROR unreachable
    |             ^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_call.rs b/src/test/ui/reachable/expr_call.rs
index 8d9f303df7f..86b95aad9c2 100644
--- a/src/test/ui/reachable/expr_call.rs
+++ b/src/test/ui/reachable/expr_call.rs
@@ -20,12 +20,12 @@ fn bar(x: !) { }
 
 fn a() {
     // the `22` is unreachable:
-    foo(return, 22);
+    foo(return, 22); //~ ERROR unreachable
 }
 
 fn b() {
     // the call is unreachable:
-    bar(return);
+    bar(return); //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_call.stderr b/src/test/ui/reachable/expr_call.stderr
index 5526827f59f..eaafe8dc5d5 100644
--- a/src/test/ui/reachable/expr_call.stderr
+++ b/src/test/ui/reachable/expr_call.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_call.rs:23:17
    |
-23 |     foo(return, 22);
+23 |     foo(return, 22); //~ ERROR unreachable
    |                 ^^
    |
 note: lint level defined here
@@ -13,7 +13,7 @@ note: lint level defined here
 error: unreachable expression
   --> $DIR/expr_call.rs:28:5
    |
-28 |     bar(return);
+28 |     bar(return); //~ ERROR unreachable
    |     ^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/reachable/expr_cast.rs b/src/test/ui/reachable/expr_cast.rs
index 926ef864ebf..76b00c00ad9 100644
--- a/src/test/ui/reachable/expr_cast.rs
+++ b/src/test/ui/reachable/expr_cast.rs
@@ -17,7 +17,7 @@
 
 fn a() {
     // the cast is unreachable:
-    let x = {return} as !;
+    let x = {return} as !; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_cast.stderr b/src/test/ui/reachable/expr_cast.stderr
index a22300dcc13..d6fb37768c5 100644
--- a/src/test/ui/reachable/expr_cast.stderr
+++ b/src/test/ui/reachable/expr_cast.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_cast.rs:20:13
    |
-20 |     let x = {return} as !;
+20 |     let x = {return} as !; //~ ERROR unreachable
    |             ^^^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_match.rs b/src/test/ui/reachable/expr_match.rs
index 23bdcc035b2..d2b96e51a95 100644
--- a/src/test/ui/reachable/expr_match.rs
+++ b/src/test/ui/reachable/expr_match.rs
@@ -17,7 +17,7 @@
 fn a() {
     // The match is considered unreachable here, because the `return`
     // diverges:
-    match {return} { }
+    match {return} { } //~ ERROR unreachable
 }
 
 fn b() {
diff --git a/src/test/ui/reachable/expr_match.stderr b/src/test/ui/reachable/expr_match.stderr
index dcfefe109c3..4b44b38895c 100644
--- a/src/test/ui/reachable/expr_match.stderr
+++ b/src/test/ui/reachable/expr_match.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_match.rs:20:5
    |
-20 |     match {return} { }
+20 |     match {return} { } //~ ERROR unreachable
    |     ^^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_method.rs b/src/test/ui/reachable/expr_method.rs
index f1d979d7df7..8be71e464b2 100644
--- a/src/test/ui/reachable/expr_method.rs
+++ b/src/test/ui/reachable/expr_method.rs
@@ -23,12 +23,12 @@ impl Foo {
 
 fn a() {
     // the `22` is unreachable:
-    Foo.foo(return, 22);
+    Foo.foo(return, 22); //~ ERROR unreachable
 }
 
 fn b() {
     // the call is unreachable:
-    Foo.bar(return);
+    Foo.bar(return); //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_method.stderr b/src/test/ui/reachable/expr_method.stderr
index 177d4352a37..db9d5c3d22c 100644
--- a/src/test/ui/reachable/expr_method.stderr
+++ b/src/test/ui/reachable/expr_method.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_method.rs:26:21
    |
-26 |     Foo.foo(return, 22);
+26 |     Foo.foo(return, 22); //~ ERROR unreachable
    |                     ^^
    |
 note: lint level defined here
@@ -13,7 +13,7 @@ note: lint level defined here
 error: unreachable expression
   --> $DIR/expr_method.rs:31:5
    |
-31 |     Foo.bar(return);
+31 |     Foo.bar(return); //~ ERROR unreachable
    |     ^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/reachable/expr_repeat.rs b/src/test/ui/reachable/expr_repeat.rs
index 6078d6d5bde..47ee2ba62b8 100644
--- a/src/test/ui/reachable/expr_repeat.rs
+++ b/src/test/ui/reachable/expr_repeat.rs
@@ -17,7 +17,7 @@
 
 fn a() {
     // the repeat is unreachable:
-    let x: [usize; 2] = [return; 2];
+    let x: [usize; 2] = [return; 2]; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_repeat.stderr b/src/test/ui/reachable/expr_repeat.stderr
index 19afc5dd7b5..54b29b616f3 100644
--- a/src/test/ui/reachable/expr_repeat.stderr
+++ b/src/test/ui/reachable/expr_repeat.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_repeat.rs:20:25
    |
-20 |     let x: [usize; 2] = [return; 2];
+20 |     let x: [usize; 2] = [return; 2]; //~ ERROR unreachable
    |                         ^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_return.rs b/src/test/ui/reachable/expr_return.rs
index c640ca06630..fac1116dc68 100644
--- a/src/test/ui/reachable/expr_return.rs
+++ b/src/test/ui/reachable/expr_return.rs
@@ -18,7 +18,7 @@
 fn a() {
     // Here we issue that the "2nd-innermost" return is unreachable,
     // but we stop there.
-    let x = {return {return {return;}}};
+    let x = {return {return {return;}}}; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_return.stderr b/src/test/ui/reachable/expr_return.stderr
index 3eb70a4dd7c..a96def6011e 100644
--- a/src/test/ui/reachable/expr_return.stderr
+++ b/src/test/ui/reachable/expr_return.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_return.rs:21:22
    |
-21 |     let x = {return {return {return;}}};
+21 |     let x = {return {return {return;}}}; //~ ERROR unreachable
    |                      ^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_struct.rs b/src/test/ui/reachable/expr_struct.rs
index 09e31819279..b5acd395be6 100644
--- a/src/test/ui/reachable/expr_struct.rs
+++ b/src/test/ui/reachable/expr_struct.rs
@@ -22,22 +22,22 @@ struct Foo {
 
 fn a() {
     // struct expr is unreachable:
-    let x = Foo { a: 22, b: 33, ..return };
+    let x = Foo { a: 22, b: 33, ..return }; //~ ERROR unreachable
 }
 
 fn b() {
     // the `33` is unreachable:
-    let x = Foo { a: return, b: 33, ..return };
+    let x = Foo { a: return, b: 33, ..return }; //~ ERROR unreachable
 }
 
 fn c() {
     // the `..return` is unreachable:
-    let x = Foo { a: 22, b: return, ..return };
+    let x = Foo { a: 22, b: return, ..return }; //~ ERROR unreachable
 }
 
 fn d() {
     // the struct expr is unreachable:
-    let x = Foo { a: 22, b: return };
+    let x = Foo { a: 22, b: return }; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_struct.stderr b/src/test/ui/reachable/expr_struct.stderr
index 4b7ac660413..b2cb1ef19cf 100644
--- a/src/test/ui/reachable/expr_struct.stderr
+++ b/src/test/ui/reachable/expr_struct.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_struct.rs:25:13
    |
-25 |     let x = Foo { a: 22, b: 33, ..return };
+25 |     let x = Foo { a: 22, b: 33, ..return }; //~ ERROR unreachable
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
@@ -13,19 +13,19 @@ note: lint level defined here
 error: unreachable expression
   --> $DIR/expr_struct.rs:30:33
    |
-30 |     let x = Foo { a: return, b: 33, ..return };
+30 |     let x = Foo { a: return, b: 33, ..return }; //~ ERROR unreachable
    |                                 ^^
 
 error: unreachable expression
   --> $DIR/expr_struct.rs:35:39
    |
-35 |     let x = Foo { a: 22, b: return, ..return };
+35 |     let x = Foo { a: 22, b: return, ..return }; //~ ERROR unreachable
    |                                       ^^^^^^
 
 error: unreachable expression
   --> $DIR/expr_struct.rs:40:13
    |
-40 |     let x = Foo { a: 22, b: return };
+40 |     let x = Foo { a: 22, b: return }; //~ ERROR unreachable
    |             ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/reachable/expr_tup.rs b/src/test/ui/reachable/expr_tup.rs
index 7c75296de6c..089020bf385 100644
--- a/src/test/ui/reachable/expr_tup.rs
+++ b/src/test/ui/reachable/expr_tup.rs
@@ -17,12 +17,12 @@
 
 fn a() {
     // the `2` is unreachable:
-    let x: (usize, usize) = (return, 2);
+    let x: (usize, usize) = (return, 2); //~ ERROR unreachable
 }
 
 fn b() {
     // the tuple is unreachable:
-    let x: (usize, usize) = (2, return);
+    let x: (usize, usize) = (2, return); //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_tup.stderr b/src/test/ui/reachable/expr_tup.stderr
index 63f477fd0c3..af43162a984 100644
--- a/src/test/ui/reachable/expr_tup.stderr
+++ b/src/test/ui/reachable/expr_tup.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_tup.rs:20:38
    |
-20 |     let x: (usize, usize) = (return, 2);
+20 |     let x: (usize, usize) = (return, 2); //~ ERROR unreachable
    |                                      ^
    |
 note: lint level defined here
@@ -13,7 +13,7 @@ note: lint level defined here
 error: unreachable expression
   --> $DIR/expr_tup.rs:25:29
    |
-25 |     let x: (usize, usize) = (2, return);
+25 |     let x: (usize, usize) = (2, return); //~ ERROR unreachable
    |                             ^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/reachable/expr_type.rs b/src/test/ui/reachable/expr_type.rs
index 2fa277c382e..29c59d5304f 100644
--- a/src/test/ui/reachable/expr_type.rs
+++ b/src/test/ui/reachable/expr_type.rs
@@ -17,7 +17,7 @@
 
 fn a() {
     // the cast is unreachable:
-    let x = {return}: !;
+    let x = {return}: !; //~ ERROR unreachable
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_type.stderr b/src/test/ui/reachable/expr_type.stderr
index 6ed79974ccb..d6bcb4ec80f 100644
--- a/src/test/ui/reachable/expr_type.stderr
+++ b/src/test/ui/reachable/expr_type.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_type.rs:20:13
    |
-20 |     let x = {return}: !;
+20 |     let x = {return}: !; //~ ERROR unreachable
    |             ^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/reachable/expr_unary.rs b/src/test/ui/reachable/expr_unary.rs
index 57901fbaa7c..6cff3ff9644 100644
--- a/src/test/ui/reachable/expr_unary.rs
+++ b/src/test/ui/reachable/expr_unary.rs
@@ -15,7 +15,8 @@
 #![feature(never_type)]
 
 fn foo() {
-    let x: ! = ! { return; 22 };
+    let x: ! = ! { return; 22 }; //~ ERROR unreachable
+    //~^ ERROR cannot apply unary operator `!` to type `!`
 }
 
 fn main() { }
diff --git a/src/test/ui/reachable/expr_unary.stderr b/src/test/ui/reachable/expr_unary.stderr
index 9f4562fe297..f14824728a7 100644
--- a/src/test/ui/reachable/expr_unary.stderr
+++ b/src/test/ui/reachable/expr_unary.stderr
@@ -1,7 +1,7 @@
 error: unreachable expression
   --> $DIR/expr_unary.rs:18:28
    |
-18 |     let x: ! = ! { return; 22 };
+18 |     let x: ! = ! { return; 22 }; //~ ERROR unreachable
    |                            ^^
    |
 note: lint level defined here
@@ -13,7 +13,7 @@ note: lint level defined here
 error[E0600]: cannot apply unary operator `!` to type `!`
   --> $DIR/expr_unary.rs:18:16
    |
-18 |     let x: ! = ! { return; 22 };
+18 |     let x: ! = ! { return; 22 }; //~ ERROR unreachable
    |                ^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors