syntax: Use `Token` in visitors and fix a mut visitor test

[rust.git] / src / librustc_resolve / build_reduced_graph.rs

diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs
index a7a78a69952f4f265ad9da4c8cbc76329cd4049c..6d0b142fb2409e713d21ccd7b5789144797bfb64 100644 (file)
--- a/src/librustc_resolve/build_reduced_graph.rs
+++ b/src/librustc_resolve/build_reduced_graph.rs
@@ -34,7 +34,7 @@
 use syntax::ext::hygiene::Mark;
 use syntax::ext::tt::macro_rules;
 use syntax::feature_gate::is_builtin_attr;
-use syntax::parse::token::{self, TokenKind};
+use syntax::parse::token::{self, Token};
 use syntax::span_err;
 use syntax::std_inject::injected_crate_name;
 use syntax::symbol::{kw, sym};
@@ -1052,8 +1052,8 @@ fn visit_trait_item(&mut self, item: &'a TraitItem) {
         self.resolver.current_module = parent;
     }
 
-    fn visit_token(&mut self, t: TokenKind) {
-        if let token::Interpolated(nt) = t {
+    fn visit_token(&mut self, t: Token) {
+        if let token::Interpolated(nt) = t.kind {
             if let token::NtExpr(ref expr) = *nt {
                 if let ast::ExprKind::Mac(..) = expr.node {
                     self.visit_invoc(expr.id);