diff options
| author | Lindsey Kuper <lindsey@rockstargirl.org> | 2012-08-17 12:27:57 -0700 |
|---|---|---|
| committer | Lindsey Kuper <lindsey@rockstargirl.org> | 2012-08-17 14:32:34 -0700 |
| commit | eb834fdb81930c676010a184db1eda9a622edc44 (patch) | |
| tree | 55b0dd8b403ab0ae6de72b42b94d0d25e6efa1bb | |
| parent | 0ace896d1feb5d165e24bfaeba67e113eeb4ba9b (diff) | |
| download | rust-eb834fdb81930c676010a184db1eda9a622edc44.tar.gz rust-eb834fdb81930c676010a184db1eda9a622edc44.zip | |
Stop parsing `iface`.
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/trait-keyword.rs | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index c1e5de48741..3e9ef00f97d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3185,12 +3185,6 @@ struct parser { return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, visibility, maybe_append(attrs, extra_attrs))); - } else if items_allowed && self.eat_keyword(~"iface") { - self.warn(~"`iface` is deprecated; use `trait`"); - let (ident, item_, extra_attrs) = self.parse_item_trait(); - return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, - visibility, - maybe_append(attrs, extra_attrs))); } else if items_allowed && self.eat_keyword(~"trait") { let (ident, item_, extra_attrs) = self.parse_item_trait(); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 0f4d71c281c..82f61b7ed3e 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -339,7 +339,7 @@ fn restricted_keyword_table() -> hashmap<~str, ()> { ~"do", ~"drop", ~"else", ~"enum", ~"export", ~"extern", ~"fail", ~"false", ~"fn", ~"for", - ~"if", ~"iface", ~"impl", ~"import", + ~"if", ~"impl", ~"import", ~"let", ~"log", ~"loop", ~"match", ~"mod", ~"module", ~"move", ~"mut", ~"new", diff --git a/src/test/compile-fail/trait-keyword.rs b/src/test/compile-fail/trait-keyword.rs index a2ae5a42849..11e3e823b74 100644 --- a/src/test/compile-fail/trait-keyword.rs +++ b/src/test/compile-fail/trait-keyword.rs @@ -1,5 +1,3 @@ -iface foo { } //~ WARN `iface` is deprecated; use `trait` +iface foo { } //~ ERROR iface -fn main() { - x //~ ERROR unresolved name: x -} \ No newline at end of file +fn main() {} \ No newline at end of file |