Skip to content

Commit 3f59a4b

Browse files
committed
More work on #2082, remove parser/lexer support for 'crust' and 'native'.
1 parent be2c920 commit 3f59a4b

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ class parser {
149149
fn get_id() -> node_id { next_node_id(self.sess) }
150150

151151
fn parse_ty_fn(purity: ast::purity) -> ty_ {
152-
let proto = if self.eat_keyword("native") ||
153-
self.eat_keyword("extern") {
152+
let proto = if self.eat_keyword("extern") {
154153
self.expect_keyword("fn");
155154
ast::proto_bare
156155
} else {
@@ -433,8 +432,7 @@ class parser {
433432
self.parse_ty_fn(ast::unsafe_fn)
434433
} else if self.is_keyword("fn") {
435434
self.parse_ty_fn(ast::impure_fn)
436-
} else if self.eat_keyword("native") ||
437-
self.eat_keyword("extern") {
435+
} else if self.eat_keyword("extern") {
438436
self.expect_keyword("fn");
439437
ty_fn(proto_bare, self.parse_ty_fn_decl(ast::impure_fn))
440438
} else if self.token == token::MOD_SEP || is_ident(self.token) {
@@ -2457,13 +2455,8 @@ class parser {
24572455
} else {
24582456
self.parse_item_foreign_mod()
24592457
}
2460-
} else if self.eat_keyword("crust") {
2461-
self.expect_keyword("fn");
2462-
self.parse_item_fn(extern_fn)
24632458
} else if self.eat_keyword("mod") {
24642459
self.parse_item_mod()
2465-
} else if self.eat_keyword("native") {
2466-
self.parse_item_foreign_mod()
24672460
} else if self.eat_keyword("type") {
24682461
self.parse_item_type()
24692462
} else if self.eat_keyword("enum") {

src/libsyntax/parse/token.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,14 @@ fn restricted_keyword_table() -> hashmap<str, ()> {
293293
"alt",
294294
"assert",
295295
"break",
296-
"check", "claim", "class", "const", "cont", "copy", "crust",
296+
"check", "claim", "class", "const", "cont", "copy",
297297
"do", "drop",
298298
"else", "enum", "export", "extern",
299299
"fail", "false", "fn", "for",
300300
"if", "iface", "impl", "import",
301301
"let", "log", "loop",
302302
"mod", "mut",
303-
"native", "new",
303+
"new",
304304
"pure", "ret",
305305
"true", "trait", "type",
306306
"unchecked", "unsafe",

0 commit comments

Comments
 (0)