about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-28 10:08:56 +0000
committerbors <bors@rust-lang.org>2018-04-28 10:08:56 +0000
commitff65726ebf1d7d732e24175a41381e53f39ee892 (patch)
treea1154de1939f1d16c5ac221d3b6c504ccb5ecff2
parent207bc403799e4a8a04f873be94834ccc09c1412b (diff)
parentedee60d872094dfb1a0ddf65bd5097cf16ad89a2 (diff)
downloadrust-ff65726ebf1d7d732e24175a41381e53f39ee892.tar.gz
rust-ff65726ebf1d7d732e24175a41381e53f39ee892.zip
Auto merge of #50155 - est31:label_expressions, r=petrochenkov
'label can start expressions

```Rust
let foo = 'label: loop { break 'label 42; };
```

is valid Rust code.
-rw-r--r--src/libsyntax/parse/token.rs3
-rw-r--r--src/test/ui/lifetime_starts_expressions.rs23
-rw-r--r--src/test/ui/lifetime_starts_expressions.stderr14
3 files changed, 39 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 44394384c7a..938711ca1d4 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -277,9 +277,10 @@ impl Token {
             DotDot | DotDotDot | DotDotEq     | // range notation
             Lt | BinOp(Shl)                   | // associated path
             ModSep                            | // global path
+            Lifetime(..)                      | // labeled loop
             Pound                             => true, // expression attributes
             Interpolated(ref nt) => match nt.0 {
-                NtIdent(..) | NtExpr(..) | NtBlock(..) | NtPath(..) => true,
+                NtIdent(..) | NtExpr(..) | NtBlock(..) | NtPath(..) | NtLifetime(..) => true,
                 _ => false,
             },
             _ => false,
diff --git a/src/test/ui/lifetime_starts_expressions.rs b/src/test/ui/lifetime_starts_expressions.rs
new file mode 100644
index 00000000000..ffe1d7c353b
--- /dev/null
+++ b/src/test/ui/lifetime_starts_expressions.rs
@@ -0,0 +1,23 @@
+// Copyright 2018 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 foo() -> u32 {
+    return 'label: loop { break 'label 42; };
+}
+
+fn bar() -> u32 {
+    loop { break 'label: loop { break 'label 42; }; }
+    //~^ ERROR expected identifier, found keyword `loop`
+    //~| ERROR expected type, found keyword `loop`
+}
+
+pub fn main() {
+    foo();
+}
diff --git a/src/test/ui/lifetime_starts_expressions.stderr b/src/test/ui/lifetime_starts_expressions.stderr
new file mode 100644
index 00000000000..de42f1daa1e
--- /dev/null
+++ b/src/test/ui/lifetime_starts_expressions.stderr
@@ -0,0 +1,14 @@
+error: expected identifier, found keyword `loop`
+  --> $DIR/lifetime_starts_expressions.rs:16:26
+   |
+LL |     loop { break 'label: loop { break 'label 42; }; }
+   |                          ^^^^ expected identifier, found keyword
+
+error: expected type, found keyword `loop`
+  --> $DIR/lifetime_starts_expressions.rs:16:26
+   |
+LL |     loop { break 'label: loop { break 'label 42; }; }
+   |                          ^^^^ expecting a type here because of type ascription
+
+error: aborting due to 2 previous errors
+