about summary refs log tree commit diff
path: root/src/librustc_builtin_macros
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-01-01 19:25:28 +0100
committerMazdak Farrokhzad <twingoow@gmail.com>2020-01-02 13:57:04 +0100
commit75e4783f63fc7a788d8dff47504b29dcd63d97fe (patch)
treead3199f1bb8f8e6a1a7b68ff7d1994017f8ef914 /src/librustc_builtin_macros
parent766fba3fdca8fe075c370a63d2f76f8407483af5 (diff)
downloadrust-75e4783f63fc7a788d8dff47504b29dcd63d97fe.tar.gz
rust-75e4783f63fc7a788d8dff47504b29dcd63d97fe.zip
Normalize `syntax::source_map` imports.
Diffstat (limited to 'src/librustc_builtin_macros')
-rw-r--r--src/librustc_builtin_macros/deriving/generic/mod.rs2
-rw-r--r--src/librustc_builtin_macros/deriving/generic/ty.rs2
-rw-r--r--src/librustc_builtin_macros/global_asm.rs2
-rw-r--r--src/librustc_builtin_macros/test.rs2
-rw-r--r--src/librustc_builtin_macros/test_harness.rs2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_builtin_macros/deriving/generic/mod.rs b/src/librustc_builtin_macros/deriving/generic/mod.rs
index da81e52fb69..44b30118f5a 100644
--- a/src/librustc_builtin_macros/deriving/generic/mod.rs
+++ b/src/librustc_builtin_macros/deriving/generic/mod.rs
@@ -182,13 +182,13 @@ use std::iter;
 use std::vec;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::source_map::respan;
 use rustc_span::Span;
 use syntax::ast::{self, BinOpKind, EnumDef, Expr, Generics, Ident, PatKind};
 use syntax::ast::{GenericArg, GenericParamKind, VariantData};
 use syntax::attr;
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::source_map::respan;
 use syntax::symbol::{kw, sym, Symbol};
 use syntax::util::map_in_place::MapInPlace;
 
diff --git a/src/librustc_builtin_macros/deriving/generic/ty.rs b/src/librustc_builtin_macros/deriving/generic/ty.rs
index 4597bfe3d1c..d2df64cac48 100644
--- a/src/librustc_builtin_macros/deriving/generic/ty.rs
+++ b/src/librustc_builtin_macros/deriving/generic/ty.rs
@@ -5,11 +5,11 @@ pub use PtrTy::*;
 pub use Ty::*;
 
 use rustc_expand::base::ExtCtxt;
+use rustc_span::source_map::{respan, DUMMY_SP};
 use rustc_span::symbol::kw;
 use rustc_span::Span;
 use syntax::ast::{self, Expr, GenericArg, GenericParamKind, Generics, Ident, SelfKind};
 use syntax::ptr::P;
-use syntax::source_map::{respan, DUMMY_SP};
 
 /// The types of pointers
 #[derive(Clone)]
diff --git a/src/librustc_builtin_macros/global_asm.rs b/src/librustc_builtin_macros/global_asm.rs
index f36b9af7724..2bcd76e6699 100644
--- a/src/librustc_builtin_macros/global_asm.rs
+++ b/src/librustc_builtin_macros/global_asm.rs
@@ -10,11 +10,11 @@
 use errors::DiagnosticBuilder;
 
 use rustc_expand::base::{self, *};
+use rustc_span::source_map::respan;
 use rustc_span::Span;
 use smallvec::smallvec;
 use syntax::ast;
 use syntax::ptr::P;
-use syntax::source_map::respan;
 use syntax::token;
 use syntax::tokenstream::TokenStream;
 
diff --git a/src/librustc_builtin_macros/test.rs b/src/librustc_builtin_macros/test.rs
index 280565badfd..758f8516e0e 100644
--- a/src/librustc_builtin_macros/test.rs
+++ b/src/librustc_builtin_macros/test.rs
@@ -3,11 +3,11 @@
 use crate::util::check_builtin_macro_attribute;
 
 use rustc_expand::base::*;
+use rustc_span::source_map::respan;
 use rustc_span::Span;
 use syntax::ast;
 use syntax::attr;
 use syntax::print::pprust;
-use syntax::source_map::respan;
 use syntax::symbol::{sym, Symbol};
 
 use std::iter;
diff --git a/src/librustc_builtin_macros/test_harness.rs b/src/librustc_builtin_macros/test_harness.rs
index ea0c2d07093..fa3a4c2ad2d 100644
--- a/src/librustc_builtin_macros/test_harness.rs
+++ b/src/librustc_builtin_macros/test_harness.rs
@@ -5,6 +5,7 @@ use rustc_expand::base::{ExtCtxt, Resolver};
 use rustc_expand::expand::{AstFragment, ExpansionConfig};
 use rustc_feature::Features;
 use rustc_span::hygiene::{AstPass, SyntaxContext, Transparency};
+use rustc_span::source_map::respan;
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::PanicStrategy;
 use smallvec::{smallvec, SmallVec};
@@ -14,7 +15,6 @@ use syntax::entry::{self, EntryPointType};
 use syntax::mut_visit::{ExpectOne, *};
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::source_map::respan;
 use syntax::symbol::{sym, Symbol};
 
 use std::{iter, mem};