Skip to content

Commit ff65726

Browse files
committed
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.
2 parents 207bc40 + edee60d commit ff65726

File tree

3 files changed

+39
-1
lines changed

3 files changed

+39
-1
lines changed

src/libsyntax/parse/token.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,10 @@ impl Token {
277277
DotDot | DotDotDot | DotDotEq | // range notation
278278
Lt | BinOp(Shl) | // associated path
279279
ModSep | // global path
280+
Lifetime(..) | // labeled loop
280281
Pound => true, // expression attributes
281282
Interpolated(ref nt) => match nt.0 {
282-
NtIdent(..) | NtExpr(..) | NtBlock(..) | NtPath(..) => true,
283+
NtIdent(..) | NtExpr(..) | NtBlock(..) | NtPath(..) | NtLifetime(..) => true,
283284
_ => false,
284285
},
285286
_ => false,
+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn foo() -> u32 {
12+
return 'label: loop { break 'label 42; };
13+
}
14+
15+
fn bar() -> u32 {
16+
loop { break 'label: loop { break 'label 42; }; }
17+
//~^ ERROR expected identifier, found keyword `loop`
18+
//~| ERROR expected type, found keyword `loop`
19+
}
20+
21+
pub fn main() {
22+
foo();
23+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: expected identifier, found keyword `loop`
2+
--> $DIR/lifetime_starts_expressions.rs:16:26
3+
|
4+
LL | loop { break 'label: loop { break 'label 42; }; }
5+
| ^^^^ expected identifier, found keyword
6+
7+
error: expected type, found keyword `loop`
8+
--> $DIR/lifetime_starts_expressions.rs:16:26
9+
|
10+
LL | loop { break 'label: loop { break 'label 42; }; }
11+
| ^^^^ expecting a type here because of type ascription
12+
13+
error: aborting due to 2 previous errors
14+

0 commit comments

Comments
 (0)