about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-06-07 15:47:05 -0700
committerCorey Richardson <corey@octayn.net>2013-06-28 10:44:15 -0400
commit90ad44428759617723f2f4630aa22bbed6f33aaf (patch)
tree8af71374edf4477c4981728b1a9de8d7fb03d8e8 /src/libsyntax
parentf9b54541ee2bbab1d81b14252f4d4172e10fd748 (diff)
downloadrust-90ad44428759617723f2f4630aa22bbed6f33aaf.tar.gz
rust-90ad44428759617723f2f4630aa22bbed6f33aaf.zip
libsyntax: Fix merge fallout
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/parser.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 11c73fe5711..5981e39abb7 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -84,8 +84,10 @@ use parse::obsolete::{ObsoletePurity, ObsoleteStaticMethod};
 use parse::obsolete::{ObsoleteConstItem, ObsoleteFixedLengthVectorType};
 use parse::obsolete::{ObsoleteNamedExternModule, ObsoleteMultipleLocalDecl};
 use parse::obsolete::{ObsoleteMutWithMultipleBindings};
-use parse::token::{can_begin_expr, get_ident_interner, is_ident, is_ident_or_path};
-use parse::token::{is_plain_ident, INTERPOLATED, keywords, special_idents, token_to_binop};
+use parse::token::{can_begin_expr, get_ident_interner, ident_to_str, is_ident};
+use parse::token::{is_ident_or_path};
+use parse::token::{is_plain_ident, INTERPOLATED, keywords, special_idents};
+use parse::token::{token_to_binop};
 use parse::token;
 use parse::{new_sub_parser_from_file, next_node_id, ParseSess};
 use opt_vec;