---

yaml
---
r: 29907
b: refs/heads/incoming
c: eb834fd
h: refs/heads/master
i:
  29905: 93cee8c
  29903: 5ed0da4
v: v3

Author: lkuper

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0ace896d1feb5d165e24bfaeba67e113eeb4ba9b
+refs/heads/incoming: eb834fdb81930c676010a184db1eda9a622edc44
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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_,

branches/incoming/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",

branches/incoming/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
-}
+fn main() {}