Skip to content

Commit 2d066fb

Browse files
committed
---
yaml --- r: 27856 b: refs/heads/try c: 2489baf h: refs/heads/master v: v3
1 parent 1aeb922 commit 2d066fb

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: b8845f0e258a983514fcf9777202720705341446
5+
refs/heads/try: 2489baf82ed8d5dd99e2204a9246e08c300e075e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,7 @@ class parser {
16001600

16011601
fn parse_loop_expr() -> @expr {
16021602
let opt_ident;
1603-
if is_ident(self.token) {
1603+
if is_ident(self.token) && !self.is_any_keyword(copy self.token) {
16041604
opt_ident = some(self.parse_ident());
16051605
self.expect(token::COLON);
16061606
} else {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Tests that "loop unsafe" isn't misparsed.
2+
3+
fn main() {
4+
loop unsafe {
5+
io::println("Hello world!");
6+
}
7+
}
8+

0 commit comments

Comments
 (0)