Skip to content

Commit eb834fd

Browse files
committed
Stop parsing iface.
1 parent 0ace896 commit eb834fd

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3185,12 +3185,6 @@ struct parser {
31853185
return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
31863186
visibility,
31873187
maybe_append(attrs, extra_attrs)));
3188-
} else if items_allowed && self.eat_keyword(~"iface") {
3189-
self.warn(~"`iface` is deprecated; use `trait`");
3190-
let (ident, item_, extra_attrs) = self.parse_item_trait();
3191-
return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
3192-
visibility,
3193-
maybe_append(attrs, extra_attrs)));
31943188
} else if items_allowed && self.eat_keyword(~"trait") {
31953189
let (ident, item_, extra_attrs) = self.parse_item_trait();
31963190
return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,

src/libsyntax/parse/token.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ fn restricted_keyword_table() -> hashmap<~str, ()> {
339339
~"do", ~"drop",
340340
~"else", ~"enum", ~"export", ~"extern",
341341
~"fail", ~"false", ~"fn", ~"for",
342-
~"if", ~"iface", ~"impl", ~"import",
342+
~"if", ~"impl", ~"import",
343343
~"let", ~"log", ~"loop",
344344
~"match", ~"mod", ~"module", ~"move", ~"mut",
345345
~"new",
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
iface foo { } //~ WARN `iface` is deprecated; use `trait`
1+
iface foo { } //~ ERROR iface
22

3-
fn main() {
4-
x //~ ERROR unresolved name: x
5-
}
3+
fn main() {}

0 commit comments

Comments
 (0)