---

yaml
---
r: 27885
b: refs/heads/try
c: eb834fd
h: refs/heads/master
i:
  27883: 3c71973
v: v3

Author: lkuper

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 0ace896d1feb5d165e24bfaeba67e113eeb4ba9b
+refs/heads/try: eb834fdb81930c676010a184db1eda9a622edc44
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/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/try/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/try/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() {}