Normalize `syntax::source_map` imports.

17 files changed, 17 insertions, 17 deletions

diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs
index c1fe1bec342..00026d6969b 100644
--- a/src/librustc/hir/map/collector.rs
+++ b/src/librustc/hir/map/collector.rs
@@ -11,10 +11,10 @@ use crate::session::Session;
 use crate::util::nodemap::FxHashMap;
 use rustc_data_structures::svh::Svh;
 use rustc_index::vec::IndexVec;
+use rustc_span::source_map::SourceMap;
 use rustc_span::Span;
 use std::iter::repeat;
 use syntax::ast::NodeId;
-use syntax::source_map::SourceMap;
 
 use crate::ich::StableHashingContext;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index 7445f35dd21..9ea10d0c515 100644
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -17,10 +17,10 @@ use crate::util::nodemap::FxHashMap;
 use rustc_data_structures::svh::Svh;
 use rustc_index::vec::IndexVec;
 use rustc_span::hygiene::MacroKind;
+use rustc_span::source_map::Spanned;
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::abi::Abi;
 use syntax::ast::{self, Name, NodeId};
-use syntax::source_map::Spanned;
 
 pub mod blocks;
 mod collector;
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
index 7cc57ed7528..10b8b5fe390 100644
--- a/src/librustc/hir/print.rs
+++ b/src/librustc/hir/print.rs
@@ -1,3 +1,4 @@
+use rustc_span::source_map::{SourceMap, Spanned};
 use rustc_span::{self, BytePos, FileName};
 use rustc_target::spec::abi::Abi;
 use syntax::ast;
@@ -5,7 +6,6 @@ use syntax::print::pp::Breaks::{Consistent, Inconsistent};
 use syntax::print::pp::{self, Breaks};
 use syntax::print::pprust::{self, Comments, PrintState};
 use syntax::sess::ParseSess;
-use syntax::source_map::{SourceMap, Spanned};
 use syntax::symbol::kw;
 use syntax::util::parser::{self, AssocOp, Fixity};
 
diff --git a/src/librustc/ich/hcx.rs b/src/librustc/ich/hcx.rs
index 305b6058d34..2c314e6935f 100644
--- a/src/librustc/ich/hcx.rs
+++ b/src/librustc/ich/hcx.rs
@@ -9,9 +9,9 @@ use crate::ty::{fast_reject, TyCtxt};
 
 use std::cmp::Ord;
 
+use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos, SourceFile};
 use syntax::ast;
-use syntax::source_map::SourceMap;
 use syntax::symbol::Symbol;
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
diff --git a/src/librustc/infer/canonical/mod.rs b/src/librustc/infer/canonical/mod.rs
index f6a716a1204..a588d3d028a 100644
--- a/src/librustc/infer/canonical/mod.rs
+++ b/src/librustc/infer/canonical/mod.rs
@@ -30,9 +30,9 @@ use crate::ty::{self, BoundVar, List, Region, TyCtxt};
 use rustc_index::vec::IndexVec;
 use rustc_macros::HashStable;
 use rustc_serialize::UseSpecializedDecodable;
+use rustc_span::source_map::Span;
 use smallvec::SmallVec;
 use std::ops::Index;
-use syntax::source_map::Span;
 
 mod canonicalizer;
 
diff --git a/src/librustc/infer/error_reporting/need_type_info.rs b/src/librustc/infer/error_reporting/need_type_info.rs
index a94595b227b..41a492751e7 100644
--- a/src/librustc/infer/error_reporting/need_type_info.rs
+++ b/src/librustc/infer/error_reporting/need_type_info.rs
@@ -6,9 +6,9 @@ use crate::infer::InferCtxt;
 use crate::ty::print::Print;
 use crate::ty::{self, DefIdTree, Infer, Ty, TyVar};
 use errors::{Applicability, DiagnosticBuilder};
+use rustc_span::source_map::DesugaringKind;
 use rustc_span::Span;
 use std::borrow::Cow;
-use syntax::source_map::DesugaringKind;
 use syntax::symbol::kw;
 
 use rustc_error_codes::*;
diff --git a/src/librustc/infer/error_reporting/nice_region_error/mod.rs b/src/librustc/infer/error_reporting/nice_region_error/mod.rs
index 023d9f89b03..5da65a30193 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/mod.rs
+++ b/src/librustc/infer/error_reporting/nice_region_error/mod.rs
@@ -4,7 +4,7 @@ use crate::infer::InferCtxt;
 use crate::ty::{self, TyCtxt};
 use crate::util::common::ErrorReported;
 use errors::DiagnosticBuilder;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 mod different_lifetimes;
 mod find_anon_type;
diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index fa6e93d867b..bdc2b216449 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -9,10 +9,10 @@ use crate::middle::stability;
 use crate::session::Session;
 use errors::{pluralize, Applicability, DiagnosticBuilder};
 use rustc_session::declare_lint;
+use rustc_span::source_map::Span;
 use syntax::ast;
 use syntax::early_buffered_lints::{ILL_FORMED_ATTRIBUTE_INPUT, META_VARIABLE_MISUSE};
 use syntax::edition::Edition;
-use syntax::source_map::Span;
 use syntax::symbol::Symbol;
 
 declare_lint! {
diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs
index edf7df16c87..86e6bfb5979 100644
--- a/src/librustc/lint/levels.rs
+++ b/src/librustc/lint/levels.rs
@@ -9,11 +9,11 @@ use crate::session::Session;
 use crate::util::nodemap::FxHashMap;
 use errors::{Applicability, DiagnosticBuilder};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_span::source_map::MultiSpan;
 use syntax::ast;
 use syntax::attr;
 use syntax::feature_gate;
 use syntax::print::pprust;
-use syntax::source_map::MultiSpan;
 use syntax::symbol::{sym, Symbol};
 
 use rustc_error_codes::*;
diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs
index 7e433f50db2..0286a174c68 100644
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@ -33,9 +33,9 @@ use crate::ty::TyCtxt;
 use crate::util::nodemap::NodeMap;
 use errors::{DiagnosticBuilder, DiagnosticId};
 use rustc_span::hygiene::MacroKind;
+use rustc_span::source_map::{DesugaringKind, ExpnKind, MultiSpan};
 use rustc_span::Span;
 use syntax::ast;
-use syntax::source_map::{DesugaringKind, ExpnKind, MultiSpan};
 use syntax::symbol::Symbol;
 
 pub use crate::lint::context::{
diff --git a/src/librustc/mir/mono.rs b/src/librustc/mir/mono.rs
index b13b4fd3b8d..bf5cc58b118 100644
--- a/src/librustc/mir/mono.rs
+++ b/src/librustc/mir/mono.rs
@@ -8,10 +8,10 @@ use crate::ty::{subst::InternalSubsts, Instance, InstanceDef, SymbolName, TyCtxt
 use crate::util::nodemap::FxHashMap;
 use rustc_data_structures::base_n;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_span::source_map::Span;
 use std::fmt;
 use std::hash::Hash;
 use syntax::attr::InlineAttr;
-use syntax::source_map::Span;
 use syntax::symbol::Symbol;
 
 /// Describes how a monomorphization will be instantiated in object files.
diff --git a/src/librustc/traits/query/dropck_outlives.rs b/src/librustc/traits/query/dropck_outlives.rs
index 80a82021c9a..87f7f674dab 100644
--- a/src/librustc/traits/query/dropck_outlives.rs
+++ b/src/librustc/traits/query/dropck_outlives.rs
@@ -3,8 +3,8 @@ use crate::infer::canonical::OriginalQueryValues;
 use crate::infer::InferOk;
 use crate::ty::subst::GenericArg;
 use crate::ty::{self, Ty, TyCtxt};
+use rustc_span::source_map::Span;
 use std::iter::FromIterator;
-use syntax::source_map::Span;
 
 use rustc_error_codes::*;
 
diff --git a/src/librustc/traits/query/outlives_bounds.rs b/src/librustc/traits/query/outlives_bounds.rs
index 722bd0bca6a..6a0bc167c07 100644
--- a/src/librustc/traits/query/outlives_bounds.rs
+++ b/src/librustc/traits/query/outlives_bounds.rs
@@ -4,7 +4,7 @@ use crate::infer::InferCtxt;
 use crate::traits::query::NoSolution;
 use crate::traits::{FulfillmentContext, ObligationCause, TraitEngine, TraitEngineExt};
 use crate::ty::{self, Ty};
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use crate::ich::StableHashingContext;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
diff --git a/src/librustc/traits/query/type_op/custom.rs b/src/librustc/traits/query/type_op/custom.rs
index 3ca6636c1de..c1c9030b888 100644
--- a/src/librustc/traits/query/type_op/custom.rs
+++ b/src/librustc/traits/query/type_op/custom.rs
@@ -5,8 +5,8 @@ use std::fmt;
 use crate::infer::canonical::query_response;
 use crate::infer::canonical::QueryRegionConstraints;
 use crate::traits::{ObligationCause, TraitEngine, TraitEngineExt};
+use rustc_span::source_map::DUMMY_SP;
 use std::rc::Rc;
-use syntax::source_map::DUMMY_SP;
 
 pub struct CustomTypeOp<F, G> {
     closure: F,
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index d83a720170b..d1296bb1791 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -59,6 +59,7 @@ use rustc_data_structures::stable_hasher::{
 use rustc_data_structures::sync::{Lock, Lrc, WorkerLocal};
 use rustc_index::vec::{Idx, IndexVec};
 use rustc_macros::HashStable;
+use rustc_span::source_map::MultiSpan;
 use rustc_span::Span;
 use rustc_target::spec::abi;
 use smallvec::SmallVec;
@@ -75,7 +76,6 @@ use std::sync::Arc;
 use syntax::ast;
 use syntax::attr;
 use syntax::expand::allocator::AllocatorKind;
-use syntax::source_map::MultiSpan;
 use syntax::symbol::{kw, sym, Symbol};
 
 pub struct AllArenas {
diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs
index a432f43d133..c29c68d2148 100644
--- a/src/librustc/ty/query/on_disk_cache.rs
+++ b/src/librustc/ty/query/on_disk_cache.rs
@@ -21,10 +21,10 @@ use rustc_serialize::{
     UseSpecializedDecodable, UseSpecializedEncodable,
 };
 use rustc_span::hygiene::{ExpnId, SyntaxContext};
+use rustc_span::source_map::{SourceMap, StableSourceFileId};
 use rustc_span::{BytePos, SourceFile, Span, DUMMY_SP};
 use std::mem;
 use syntax::ast::{Ident, NodeId};
-use syntax::source_map::{SourceMap, StableSourceFileId};
 
 const TAG_FILE_FOOTER: u128 = 0xC0FFEE_C0FFEE_C0FFEE_C0FFEE_C0FFEE;
 
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
index 0642de8c744..e56955b0e44 100644
--- a/src/librustc/ty/query/plumbing.rs
+++ b/src/librustc/ty/query/plumbing.rs
@@ -20,12 +20,12 @@ use rustc_data_structures::fx::{FxHashMap, FxHasher};
 use rustc_data_structures::sharded::Sharded;
 use rustc_data_structures::sync::{Lock, Lrc};
 use rustc_data_structures::thin_vec::ThinVec;
+use rustc_span::source_map::DUMMY_SP;
 use rustc_span::Span;
 use std::collections::hash_map::Entry;
 use std::hash::{Hash, Hasher};
 use std::mem;
 use std::ptr;
-use syntax::source_map::DUMMY_SP;
 
 use rustc_error_codes::*;