Normalize syntax::source_map imports.

src/librustc_typeck/check/closure.rs

@@ -14,10 +14,10 @@ use rustc::traits::Obligation;
 use rustc::ty::fold::TypeFoldable;
 use rustc::ty::subst::InternalSubsts;
 use rustc::ty::{self, GenericParamDefKind, Ty};
+use rustc_span::source_map::Span;
 use rustc_target::spec::abi::Abi;
 use std::cmp;
 use std::iter;
-use syntax::source_map::Span;
 
 /// What signature do we *expect* the closure to have from context?
 #[derive(Debug)]

src/librustc_typeck/check/expr.rs

@@ -32,8 +32,8 @@ use rustc::ty::Ty;
 use rustc::ty::TypeFoldable;
 use rustc::ty::{AdtKind, Visibility};
 use rustc_span::hygiene::DesugaringKind;
+use rustc_span::source_map::Span;
 use syntax::ast;
-use syntax::source_map::Span;
 use syntax::symbol::{kw, sym, Symbol};
 use syntax::util::lev_distance::find_best_match_for_name;
 

src/librustc_typeck/check/method/suggest.rs

@@ -14,9 +14,9 @@ use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use rustc::traits::Obligation;
 use rustc::ty::print::with_crate_prefix;
 use rustc::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable};
-use rustc_span::{FileName, Span};
+use rustc_span::{source_map, FileName, Span};
+use syntax::ast;
 use syntax::util::lev_distance;
-use syntax::{ast, source_map};
 
 use rustc_error_codes::*;
 

src/librustc_typeck/check/mod.rs

@@ -119,12 +119,12 @@ use rustc::ty::{
 };
 use rustc_index::vec::Idx;
 use rustc_span::hygiene::DesugaringKind;
+use rustc_span::source_map::{original_sp, DUMMY_SP};
 use rustc_span::{self, BytePos, MultiSpan, Span};
 use rustc_target::spec::abi::Abi;
 use syntax::ast;
 use syntax::attr;
 use syntax::feature_gate::feature_err;
-use syntax::source_map::{original_sp, DUMMY_SP};
 use syntax::symbol::{kw, sym, Ident};
 use syntax::util::parser::ExprPrecedence;
 

src/librustc_typeck/constrained_generic_params.rs

@@ -1,7 +1,7 @@
 use rustc::ty::fold::{TypeFoldable, TypeVisitor};
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc::util::nodemap::FxHashSet;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct Parameter(pub u32);