Skip to content

Commit 93d2b74

Browse files
committed
---
yaml --- r: 23986 b: refs/heads/master c: d0d8b7f h: refs/heads/master v: v3
1 parent 7afe5be commit 93d2b74

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 2cdb23bbc08fba2f5dc7b0dcc79983fc02e32960
2+
refs/heads/master: d0d8b7fe6491d539254d281f39a6c0aa0261e42d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -926,8 +926,6 @@ impl parser {
926926
_ => { /* fallthrough */ }
927927
}
928928
return pexpr(self.parse_fn_expr(proto));
929-
} else if self.eat_keyword(~"unchecked") {
930-
return pexpr(self.parse_block_expr(lo, unchecked_blk));
931929
} else if self.eat_keyword(~"unsafe") {
932930
return pexpr(self.parse_block_expr(lo, unsafe_blk));
933931
} else if self.token == token::LBRACKET {
@@ -2210,12 +2208,7 @@ impl parser {
22102208
}
22112209

22122210
let lo = self.span.lo;
2213-
if self.eat_keyword(~"unchecked") {
2214-
self.expect(token::LBRACE);
2215-
let {inner, next} = maybe_parse_inner_attrs_and_next(self,
2216-
parse_attrs);
2217-
return (inner, self.parse_block_tail_(lo, unchecked_blk, next));
2218-
} else if self.eat_keyword(~"unsafe") {
2211+
if self.eat_keyword(~"unsafe") {
22192212
self.expect(token::LBRACE);
22202213
let {inner, next} = maybe_parse_inner_attrs_and_next(self,
22212214
parse_attrs);

trunk/src/libsyntax/parse/token.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
439439
~"ref", ~"return",
440440
~"struct",
441441
~"true", ~"trait", ~"type",
442-
~"unchecked", ~"use",
442+
~"use",
443443
~"while"
444444
];
445445
for keys.each |word| {

0 commit comments

Comments
 (0)