diff options
| author | Lindsey Kuper <lindsey@rockstargirl.org> | 2012-07-31 10:27:51 -0700 |
|---|---|---|
| committer | Lindsey Kuper <lindsey@rockstargirl.org> | 2012-07-31 11:52:16 -0700 |
| commit | 439afaa329751b3dfd6735862cd2645705598909 (patch) | |
| tree | 4a3c51b47d6ee3c2e057677efdcf29c60e0d9d95 /src/libsyntax/parse | |
| parent | c2f49c46ae0b07aae8ae558d5a5e71ed85aeff23 (diff) | |
| download | rust-439afaa329751b3dfd6735862cd2645705598909.tar.gz rust-439afaa329751b3dfd6735862cd2645705598909.zip | |
Change remaining "iface" occurrences to "trait"; deprecate "iface"
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index f14dd7df9d2..5a343f370f3 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -9,7 +9,7 @@ export tt_reader, new_tt_reader; export nextch, is_eof, bump, get_str_from, new_low_level_string_reader; export string_reader_as_reader, tt_reader_as_reader; -iface reader { +trait reader { fn is_eof() -> bool; fn next_token() -> {tok: token::token, sp: span}; fn fatal(~str) -> !; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 594ec844bd3..17370628db9 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2702,6 +2702,7 @@ class parser { } else if self.eat_keyword(~"enum") { self.parse_item_enum(vis) } else if self.eat_keyword(~"iface") { + self.warn(~"`iface` is deprecated; use `trait`"); self.parse_item_trait() } else if self.eat_keyword(~"trait") { self.parse_item_trait() |