about summary refs log tree commit diff
path: root/src/test/ui/reachable/expr_while.stderr
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-22 06:33:01 +0000
committerbors <bors@rust-lang.org>2019-09-22 06:33:01 +0000
commit4ff32c07da9d97e6dc315a4a5c9ffbb797cb27bb (patch)
tree67d12a8832ff9f857cd263b741b9468a391448b3 /src/test/ui/reachable/expr_while.stderr
parentef906d0e3c50ba0833c5a135d705ab4f6bd93aea (diff)
parent9991d548c72529a7475d33c6925ee23601568aec (diff)
Auto merge of #64669 - estebank:unreachable, r=Centril
Use span label instead of note in unreachable lint

Fix #64636.
Diffstat (limited to 'src/test/ui/reachable/expr_while.stderr')
-rw-r--r--src/test/ui/reachable/expr_while.stderr23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/test/ui/reachable/expr_while.stderr b/src/test/ui/reachable/expr_while.stderr
index b6d6d11ac69..edb1dd2b9bc 100644
--- a/src/test/ui/reachable/expr_while.stderr
+++ b/src/test/ui/reachable/expr_while.stderr
@@ -2,38 +2,31 @@ error: unreachable block in `while` expression
   --> $DIR/expr_while.rs:7:20
    |
 LL |       while {return} {
-   |  ____________________^
+   |  ____________------__^
+   | |            |
+   | |            any code following this expression is unreachable
 LL | |
 LL | |         println!("Hello, world!");
 LL | |     }
-   | |_____^
+   | |_____^ unreachable block in `while` expression
    |
 note: lint level defined here
   --> $DIR/expr_while.rs:4:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
-note: any code following this expression is unreachable
-  --> $DIR/expr_while.rs:7:12
-   |
-LL |     while {return} {
-   |            ^^^^^^
 
 error: unreachable block in `while` expression
   --> $DIR/expr_while.rs:22:20
    |
 LL |       while {return} {
-   |  ____________________^
+   |  ____________------__^
+   | |            |
+   | |            any code following this expression is unreachable
 LL | |
 LL | |         println!("I am dead.");
 LL | |     }
-   | |_____^
-   |
-note: any code following this expression is unreachable
-  --> $DIR/expr_while.rs:22:12
-   |
-LL |     while {return} {
-   |            ^^^^^^
+   | |_____^ unreachable block in `while` expression
 
 error: aborting due to 2 previous errors