about summary refs log tree commit diff
path: root/src/libsyntax_expand/proc_macro_server.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-10-11 12:46:32 +0200
committerMazdak Farrokhzad <twingoow@gmail.com>2019-11-07 13:50:12 +0100
commit9d6768a478b8a6afa1e16dfebe9d79bd3f508cdf (patch)
treee1ac4f40d23f1b1600d24362bc53f1536eb977c7 /src/libsyntax_expand/proc_macro_server.rs
parent53a50d4e4fdb0b242d637142d0b2d64e7054c35b (diff)
downloadrust-9d6768a478b8a6afa1e16dfebe9d79bd3f508cdf.tar.gz
rust-9d6768a478b8a6afa1e16dfebe9d79bd3f508cdf.zip
syntax::parser::token -> syntax::token
Diffstat (limited to 'src/libsyntax_expand/proc_macro_server.rs')
-rw-r--r--src/libsyntax_expand/proc_macro_server.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libsyntax_expand/proc_macro_server.rs b/src/libsyntax_expand/proc_macro_server.rs
index 4ce99cfe73b..67a15e48205 100644
--- a/src/libsyntax_expand/proc_macro_server.rs
+++ b/src/libsyntax_expand/proc_macro_server.rs
@@ -1,10 +1,11 @@
 use crate::base::ExtCtxt;
 
 use syntax::ast;
-use syntax::parse::{self, token};
+use syntax::parse::{self};
 use syntax::parse::lexer::comments;
 use syntax::print::pprust;
 use syntax::sess::ParseSess;
+use syntax::token;
 use syntax::tokenstream::{self, DelimSpan, IsJoint::*, TokenStream, TreeAndJoint};
 
 use errors::Diagnostic;
@@ -52,7 +53,7 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)>
 {
     fn from_internal(((tree, is_joint), sess, stack): (TreeAndJoint, &ParseSess, &mut Vec<Self>))
                     -> Self {
-        use syntax::parse::token::*;
+        use syntax::token::*;
 
         let joint = is_joint == Joint;
         let Token { kind, span } = match tree {
@@ -193,7 +194,7 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)>
 
 impl ToInternal<TokenStream> for TokenTree<Group, Punct, Ident, Literal> {
     fn to_internal(self) -> TokenStream {
-        use syntax::parse::token::*;
+        use syntax::token::*;
 
         let (ch, joint, span) = match self {
             TokenTree::Punct(Punct { ch, joint, span }) => (ch, joint, span),