From bb867d3512b009c660f8a9c3154d19e119f7ff5d Mon Sep 17 00:00:00 2001
From: Kyle Stachowicz <kylestach99@gmail.com>
Date: Tue, 15 May 2018 17:08:24 -0700
Subject: [PATCH] Add additional test case to unused_label lint

---
 src/test/ui/lint/unused_label.rs     | 25 ++++++++++++++--------
 src/test/ui/lint/unused_label.stderr | 32 +++++++++++++++++-----------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/test/ui/lint/unused_label.rs b/src/test/ui/lint/unused_label.rs
index b3142cd86337..43cf8c75ae3f 100644
--- a/src/test/ui/lint/unused_label.rs
+++ b/src/test/ui/lint/unused_label.rs
@@ -33,22 +33,29 @@ fn main() {
         break 'used_loop_label;
     }
 
-    'used_loop_label_outer: loop {
-        'used_loop_label_inner: loop {
-            break 'used_loop_label_inner;
+    'used_loop_label_outer_1: loop {
+        'used_loop_label_inner_1: loop {
+            break 'used_loop_label_inner_1;
         }
-        break 'used_loop_label_outer;
+        break 'used_loop_label_outer_1;
     }
 
-    'unused_loop_label_outer: loop {
-        'unused_loop_label_inner: loop {
+    'used_loop_label_outer_2: loop {
+        'unused_loop_label_inner_2: loop {
             //~^ WARN unused loop label
-            break 'unused_loop_label_outer;
+            break 'used_loop_label_outer_2;
         }
     }
 
-    // This is diverging, so put it at the end so we don't get unreachable_code errors everywhere
-    // else
+    'unused_loop_label_outer_3: loop {
+        'used_loop_label_inner_3: loop {
+            //~^ WARN unused loop label
+            break 'used_loop_label_inner_3;
+        }
+    }
+
+    // This is diverging, so put it at the end so we don't get
+    // unreachable_code errors everywhere else
     'unused_loop_label: loop {
         //~^ WARN unused loop label
     }
diff --git a/src/test/ui/lint/unused_label.stderr b/src/test/ui/lint/unused_label.stderr
index 4804c268975f..3e7be476e643 100644
--- a/src/test/ui/lint/unused_label.stderr
+++ b/src/test/ui/lint/unused_label.stderr
@@ -1,31 +1,37 @@
-warning: unused loop label
-  --> $DIR/unused_loop_label.rs:19:5
+warning: unused label
+  --> $DIR/unused_label.rs:19:5
    |
 LL |     'unused_while_label: while 0 == 0 {
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: requested on the command line with `-W unused-loop-label`
+   = note: requested on the command line with `-W unused-label`
 
-warning: unused loop label
-  --> $DIR/unused_loop_label.rs:24:5
+warning: unused label
+  --> $DIR/unused_label.rs:24:5
    |
 LL |     'unused_while_let_label: while let Some(_) = opt {
    |     ^^^^^^^^^^^^^^^^^^^^^^^
 
-warning: unused loop label
-  --> $DIR/unused_loop_label.rs:28:5
+warning: unused label
+  --> $DIR/unused_label.rs:28:5
    |
 LL |     'unused_for_label: for _ in 0..10 {
    |     ^^^^^^^^^^^^^^^^^
 
-warning: unused loop label
-  --> $DIR/unused_loop_label.rs:44:9
+warning: unused label
+  --> $DIR/unused_label.rs:44:9
    |
-LL |         'unused_loop_label_inner: loop {
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         'unused_loop_label_inner_2: loop {
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-warning: unused loop label
-  --> $DIR/unused_loop_label.rs:52:5
+warning: unused label
+  --> $DIR/unused_label.rs:50:9
+   |
+LL |     'unused_loop_label_outer_3: loop {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: unused label
+  --> $DIR/unused_label.rs:52:5
    |
 LL |     'unused_loop_label: loop {
    |     ^^^^^^^^^^^^^^^^^^