about summary refs log tree commit diff
path: root/src/libsyntax
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 /src/libsyntax
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.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/token.rs3
1 files changed, 2 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,