Rollup merge of #23467 - andersk:loop-labeled-break-value, r=sanxiyn

 Closes #23451.

2 files changed, 39 insertions, 0 deletions

diff --git a/src/test/compile-fail/loop-labeled-break-value.rs b/src/test/compile-fail/loop-labeled-break-value.rs
new file mode 100644
index 00000000000..e1ae3ae464f
--- /dev/null
+++ b/src/test/compile-fail/loop-labeled-break-value.rs
@@ -0,0 +1,21 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    loop {
+        let _: i32 = loop { break }; //~ ERROR mismatched types
+    }
+    loop {
+        let _: i32 = 'inner: loop { break 'inner }; //~ ERROR mismatched types
+    }
+    loop {
+        let _: i32 = 'inner: loop { loop { break 'inner } }; //~ ERROR mismatched types
+    }
+}
diff --git a/src/test/run-pass/loop-labeled-break-value.rs b/src/test/run-pass/loop-labeled-break-value.rs
new file mode 100644
index 00000000000..f71dc6869be
--- /dev/null
+++ b/src/test/run-pass/loop-labeled-break-value.rs
@@ -0,0 +1,18 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    'outer: loop {
+        let _: i32 = loop { break 'outer };
+    }
+    'outer: loop {
+        let _: i32 = loop { loop { break 'outer } };
+    }
+}