bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stop parsing iface.

Browse source
This commit is contained in:
Lindsey Kuper 2012-08-17 12:27:57 -07:00
parent 0ace896d1f
commit eb834fdb81
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax/parse/parser.rs
View file

@ -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_,

2
src/libsyntax/parse/token.rs
View file

@ -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",

6
src/test/compile-fail/trait-keyword.rs
View file

@ -1,5 +1,3 @@
iface foo { } //~ WARN `iface` is deprecated; use `trait`
iface foo { } //~ ERROR iface
fn main() {
x //~ ERROR unresolved name: x
}
fn main() {}