Auto merge of #67853 - Centril:rollup-sx5zi9n, r=Centril

Rollup of 8 pull requests

Successful merges:

 - #66913 (Suggest calling method when first argument is `self`)
 - #67531 (no longer promote non-pattern const functions)
 - #67773 (Add a test for #37333)
 - #67786 (Nix reexports from `rustc_span` in `syntax`)
 - #67789 (Cleanup linkchecker whitelist)
 - #67810 (Implement uncommon_codepoints lint.)
 - #67835 (tweak wording of mismatched delimiter errors)
 - #67845 (Also remove const-hack for abs)

Failed merges:

r? @ghost

Cargo.lock

@@ -3642,6 +3642,7 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "syntax",
+ "unicode-security",
 ]
 
 [[package]]
@@ -4940,6 +4941,21 @@ dependencies = [
  "smallvec 1.0.0",
 ]
 
+[[package]]
+name = "unicode-script"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b2c5c29e805da6817f5af6a627d65adb045cebf05cccd5a3493d6109454391c"
+
+[[package]]
+name = "unicode-security"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c49d35967fa037b881acc34ef717c38c4b5560eba10e3685271b3f530bb19634"
+dependencies = [
+ "unicode-script",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.6.0"

src/libcore/num/mod.rs

@@ -1997,27 +1997,15 @@ $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
             #[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]
+            #[allow_internal_unstable(const_if_match)]
             #[inline]
             #[rustc_inherit_overflow_checks]
             pub const fn abs(self) -> Self {
-                // Note that the #[inline] above means that the overflow
-                // semantics of the subtraction depend on the crate we're being
-                // inlined into.
-
-                // sign is -1 (all ones) for negative numbers, 0 otherwise.
-                let sign = self >> ($BITS - 1);
-                // For positive self, sign == 0 so the expression is simply
-                // (self ^ 0) - 0 == self == abs(self).
-                //
-                // For negative self, self ^ sign == self ^ all_ones.
-                // But all_ones ^ self == all_ones - self == -1 - self.
-                // So for negative numbers, (self ^ sign) - sign is
-                // (-1 - self) - -1 == -self == abs(self).
-                //
-                // The subtraction overflows when self is min_value(), because
-                // (-1 - min_value()) - -1 is max_value() - -1 which overflows.
-                // This is exactly when we want self.abs() to overflow.
-                (self ^ sign) - sign
+                if self.is_negative() {
+                    -self
+                } else {
+                    self
+                }
             }
         }
 

src/libcore/time.rs

@@ -172,7 +172,6 @@ impl Duration {
     /// ```
     #[stable(feature = "duration", since = "1.3.0")]
     #[inline]
-    #[rustc_promotable]
     #[rustc_const_stable(feature = "duration_consts", since = "1.32.0")]
     pub const fn from_millis(millis: u64) -> Duration {
         Duration {
@@ -195,7 +194,6 @@ impl Duration {
     /// ```
     #[stable(feature = "duration_from_micros", since = "1.27.0")]
     #[inline]
-    #[rustc_promotable]
     #[rustc_const_stable(feature = "duration_consts", since = "1.32.0")]
     pub const fn from_micros(micros: u64) -> Duration {
         Duration {
@@ -218,7 +216,6 @@ impl Duration {
     /// ```
     #[stable(feature = "duration_extras", since = "1.27.0")]
     #[inline]
-    #[rustc_promotable]
     #[rustc_const_stable(feature = "duration_consts", since = "1.32.0")]
     pub const fn from_nanos(nanos: u64) -> Duration {
         Duration {

src/librustc/arena.rs

@@ -94,7 +94,7 @@ macro_rules! arena_types {
                     >
                 >,
             [few] diagnostic_items: rustc_data_structures::fx::FxHashMap<
-                syntax::symbol::Symbol,
+                rustc_span::symbol::Symbol,
                 rustc::hir::def_id::DefId,
             >,
             [few] resolve_lifetimes: rustc::middle::resolve_lifetime::ResolveLifetimes,
@@ -105,7 +105,7 @@ macro_rules! arena_types {
             [few] privacy_access_levels: rustc::middle::privacy::AccessLevels,
             [few] target_features_whitelist: rustc_data_structures::fx::FxHashMap<
                 String,
-                Option<syntax::symbol::Symbol>
+                Option<rustc_span::symbol::Symbol>
             >,
             [few] wasm_import_module_map: rustc_data_structures::fx::FxHashMap<
                 rustc::hir::def_id::DefId,

src/librustc/hir/check_attr.rs

@@ -12,11 +12,12 @@ use crate::lint::builtin::UNUSED_ATTRIBUTES;
 use crate::ty::query::Providers;
 use crate::ty::TyCtxt;
 
-use rustc_span::Span;
-use std::fmt::{self, Display};
-use syntax::{attr, symbol::sym};
-
 use rustc_error_codes::*;
+use rustc_span::symbol::sym;
+use rustc_span::Span;
+use syntax::attr;
+
+use std::fmt::{self, Display};
 
 #[derive(Copy, Clone, PartialEq)]
 pub(crate) enum MethodKind {

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};

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;

src/librustc/hir/print.rs

@@ -1,3 +1,5 @@
+use rustc_span::source_map::{SourceMap, Spanned};
+use rustc_span::symbol::kw;
 use rustc_span::{self, BytePos, FileName};
 use rustc_target::spec::abi::Abi;
 use syntax::ast;
@@ -5,8 +7,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};
 
 use crate::hir;

src/librustc/ich/hcx.rs

@@ -9,10 +9,10 @@ use crate::ty::{fast_reject, TyCtxt};
 
 use std::cmp::Ord;
 
+use rustc_span::source_map::SourceMap;
+use rustc_span::symbol::Symbol;
 use rustc_span::{BytePos, SourceFile};
 use syntax::ast;
-use syntax::source_map::SourceMap;
-use syntax::symbol::Symbol;
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};

src/librustc/ich/mod.rs

@@ -4,8 +4,8 @@ pub use self::hcx::{
     hash_stable_trait_impls, NodeIdHashingMode, StableHashingContext, StableHashingContextProvider,
 };
 crate use rustc_data_structures::fingerprint::Fingerprint;
+use rustc_span::symbol::{sym, Symbol};
 pub use rustc_span::CachingSourceMapView;
-use syntax::symbol::{sym, Symbol};
 
 mod hcx;
 

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;
 

src/librustc/infer/error_reporting/need_type_info.rs

@@ -6,10 +6,10 @@ 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::symbol::kw;
 use rustc_span::Span;
 use std::borrow::Cow;
-use syntax::source_map::DesugaringKind;
-use syntax::symbol::kw;
 
 use rustc_error_codes::*;
 

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;

src/librustc/infer/type_variable.rs

@@ -1,7 +1,7 @@
 use crate::hir::def_id::DefId;
 use crate::ty::{self, Ty, TyVid};
+use rustc_span::symbol::Symbol;
 use rustc_span::Span;
-use syntax::symbol::Symbol;
 
 use rustc_data_structures::snapshot_vec as sv;
 use rustc_data_structures::unify as ut;

src/librustc/infer/unify_key.rs

@@ -1,8 +1,8 @@
 use crate::ty::{self, FloatVarValue, InferConst, IntVarValue, Ty, TyCtxt};
 use rustc_data_structures::unify::InPlace;
 use rustc_data_structures::unify::{EqUnifyValue, NoError, UnificationTable, UnifyKey, UnifyValue};
+use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::symbol::Symbol;
 
 use std::cell::RefMut;
 use std::cmp;

src/librustc/lint/builtin.rs

@@ -9,11 +9,11 @@ use crate::middle::stability;
 use crate::session::Session;
 use errors::{pluralize, Applicability, DiagnosticBuilder};
 use rustc_session::declare_lint;
+use rustc_span::edition::Edition;
+use rustc_span::source_map::Span;
+use rustc_span::symbol::Symbol;
 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! {
     pub EXCEEDING_BITSHIFTS,

src/librustc/lint/internal.rs

@@ -8,8 +8,8 @@ use crate::lint::{
 use errors::Applicability;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_session::declare_tool_lint;
+use rustc_span::symbol::{sym, Symbol};
 use syntax::ast::{Ident, Item, ItemKind};
-use syntax::symbol::{sym, Symbol};
 
 declare_tool_lint! {
     pub rustc::DEFAULT_HASH_TYPES,

src/librustc/lint/levels.rs

@@ -9,12 +9,12 @@ 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 rustc_span::symbol::{sym, Symbol};
 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::*;
 

src/librustc/lint/mod.rs

@@ -33,10 +33,10 @@ 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::symbol::Symbol;
 use rustc_span::Span;
 use syntax::ast;
-use syntax::source_map::{DesugaringKind, ExpnKind, MultiSpan};
-use syntax::symbol::Symbol;
 
 pub use crate::lint::context::{
     check_ast_crate, check_crate, late_lint_mod, BufferedEarlyLint, CheckLintNameResult,

src/librustc/middle/cstore.rs

@@ -12,13 +12,13 @@ use rustc_data_structures::svh::Svh;
 
 use rustc_data_structures::sync::{self, MetadataRef};
 use rustc_macros::HashStable;
+use rustc_span::symbol::Symbol;
 use rustc_span::Span;
 use rustc_target::spec::Target;
 use std::any::Any;
 use std::path::{Path, PathBuf};
 use syntax::ast;
 use syntax::expand::allocator::AllocatorKind;
-use syntax::symbol::Symbol;
 
 pub use self::NativeLibraryKind::*;
 pub use rustc_session::utils::NativeLibraryKind;

src/librustc/middle/lang_items.rs

@@ -19,9 +19,9 @@ use crate::util::nodemap::FxHashMap;
 use crate::hir;
 use crate::hir::itemlikevisit::ItemLikeVisitor;
 use rustc_macros::HashStable;
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use syntax::ast;
-use syntax::symbol::{sym, Symbol};
 
 use rustc_error_codes::*;
 

src/librustc/middle/mod.rs

@@ -5,7 +5,7 @@ pub mod free_region;
 pub mod lang_items;
 pub mod lib_features {
     use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-    use syntax::symbol::Symbol;
+    use rustc_span::symbol::Symbol;
 
     #[derive(HashStable)]
     pub struct LibFeatures {

src/librustc/middle/recursion_limit.rs

@@ -6,8 +6,8 @@
 // just peeks and looks for that attribute.
 
 use crate::session::Session;
+use rustc_span::symbol::{sym, Symbol};
 use syntax::ast;
-use syntax::symbol::{sym, Symbol};
 
 use rustc_data_structures::sync::Once;
 

src/librustc/middle/stability.rs

@@ -13,12 +13,12 @@ use crate::ty::{self, TyCtxt};
 use crate::util::nodemap::{FxHashMap, FxHashSet};
 use errors::DiagnosticBuilder;
 use rustc_feature::GateIssue;
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{MultiSpan, Span};
 use syntax::ast::CRATE_NODE_ID;
 use syntax::attr::{self, ConstStability, Deprecation, RustcDeprecation, Stability};
 use syntax::errors::Applicability;
 use syntax::feature_gate::feature_err_issue;
-use syntax::symbol::{sym, Symbol};
 
 use std::num::NonZeroU32;
 

src/librustc/middle/weak_lang_items.rs

@@ -9,10 +9,10 @@ use crate::hir::intravisit;
 use crate::hir::intravisit::{NestedVisitorMap, Visitor};
 use crate::ty::TyCtxt;
 use rustc_data_structures::fx::FxHashSet;
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use rustc_target::spec::PanicStrategy;
 use syntax::ast;
-use syntax::symbol::{sym, Symbol};
 
 use rustc_error_codes::*;
 

src/librustc/mir/interpret/error.rs

@@ -11,10 +11,10 @@ use backtrace::Backtrace;
 use errors::DiagnosticBuilder;
 use hir::GeneratorKind;
 use rustc_macros::HashStable;
+use rustc_span::symbol::Symbol;
 use rustc_span::{Pos, Span};
 use rustc_target::spec::abi::Abi;
 use std::{any::Any, env, fmt};
-use syntax::symbol::Symbol;
 
 use rustc_error_codes::*;
 

src/librustc/mir/mod.rs

@@ -27,6 +27,7 @@ use rustc_index::bit_set::BitMatrix;
 use rustc_index::vec::{Idx, IndexVec};
 use rustc_macros::HashStable;
 use rustc_serialize::{Decodable, Encodable};
+use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
 use smallvec::SmallVec;
 use std::borrow::Cow;
@@ -36,7 +37,6 @@ use std::slice;
 use std::{iter, mem, option, u32};
 pub use syntax::ast::Mutability;
 use syntax::ast::Name;
-use syntax::symbol::Symbol;
 
 pub use crate::mir::cache::{BodyAndCache, ReadOnlyBodyAndCache};
 pub use crate::mir::interpret::AssertMessage;

src/librustc/mir/mono.rs

@@ -8,11 +8,11 @@ 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 rustc_span::symbol::Symbol;
 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.
 #[derive(PartialEq)]

src/librustc/traits/coherence.rs

@@ -12,8 +12,8 @@ use crate::traits::{self, Normalized, Obligation, ObligationCause, SelectionCont
 use crate::ty::fold::TypeFoldable;
 use crate::ty::subst::Subst;
 use crate::ty::{self, Ty, TyCtxt};
+use rustc_span::symbol::sym;
 use rustc_span::DUMMY_SP;
-use syntax::symbol::sym;
 
 /// Whether we do the orphan check relative to this crate or
 /// to some remote crate.

src/librustc/traits/error_reporting.rs

@@ -26,10 +26,10 @@ use crate::util::nodemap::{FxHashMap, FxHashSet};
 use errors::{pluralize, Applicability, DiagnosticBuilder, Style};
 use rustc::hir::def_id::LOCAL_CRATE;
 use rustc_span::source_map::SourceMap;
+use rustc_span::symbol::{kw, sym};
 use rustc_span::{ExpnKind, MultiSpan, Span, DUMMY_SP};
 use std::fmt;
 use syntax::ast;
-use syntax::symbol::{kw, sym};
 
 use rustc_error_codes::*;
 

src/librustc/traits/object_safety.rs

@@ -16,11 +16,11 @@ use crate::lint;
 use crate::traits::{self, Obligation, ObligationCause};
 use crate::ty::subst::{InternalSubsts, Subst};
 use crate::ty::{self, Predicate, ToPredicate, Ty, TyCtxt, TypeFoldable};
+use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
 use std::borrow::Cow;
 use std::iter::{self};
 use syntax::ast::{self};
-use syntax::symbol::Symbol;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum ObjectSafetyViolation {

src/librustc/traits/on_unimplemented.rs

@@ -5,10 +5,10 @@ use crate::ty::{self, GenericParamDefKind, TyCtxt};
 use crate::util::common::ErrorReported;
 use crate::util::nodemap::FxHashMap;
 
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{MetaItem, NestedMetaItem};
 use syntax::attr;
-use syntax::symbol::{kw, sym, Symbol};
 
 use rustc_error_codes::*;
 

src/librustc/traits/project.rs

@@ -21,9 +21,9 @@ use crate::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt};
 use crate::util::common::FN_OUTPUT_NAME;
 use rustc_data_structures::snapshot_map::{Snapshot, SnapshotMap};
 use rustc_macros::HashStable;
+use rustc_span::symbol::sym;
 use rustc_span::DUMMY_SP;
 use syntax::ast::Ident;
-use syntax::symbol::sym;
 
 /// Depending on the stage of compilation, we want projection to be
 /// more or less conservative.

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::*;
 

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};

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,

src/librustc/traits/select.rs

@@ -42,6 +42,7 @@ use crate::hir;
 use crate::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::Lock;
 use rustc_index::bit_set::GrowableBitSet;
+use rustc_span::symbol::sym;
 use rustc_target::spec::abi::Abi;
 use std::cell::{Cell, RefCell};
 use std::cmp;
@@ -49,7 +50,6 @@ use std::fmt::{self, Display};
 use std::iter;
 use std::rc::Rc;
 use syntax::attr;
-use syntax::symbol::sym;
 
 pub struct SelectionContext<'cx, 'tcx> {
     infcx: &'cx InferCtxt<'cx, 'tcx>,

src/librustc/traits/structural_impls.rs

@@ -3,8 +3,8 @@ use crate::traits::project::Normalized;
 use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
 use crate::ty::{self, Lift, Ty, TyCtxt};
 use chalk_engine;
+use rustc_span::symbol::Symbol;
 use smallvec::SmallVec;
-use syntax::symbol::Symbol;
 
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt;

src/librustc/ty/context.rs

@@ -59,6 +59,8 @@ 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::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use rustc_target::spec::abi;
 use smallvec::SmallVec;
@@ -75,8 +77,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 {
     pub interner: SyncDroplessArena,

src/librustc/ty/print/pretty.rs

@@ -11,10 +11,10 @@ use crate::ty::{self, DefIdTree, ParamConst, Ty, TyCtxt, TypeFoldable};
 
 use rustc_apfloat::ieee::{Double, Single};
 use rustc_apfloat::Float;
+use rustc_span::symbol::{kw, Symbol};
 use rustc_target::spec::abi::Abi;
 use syntax::ast;
 use syntax::attr::{SignedInt, UnsignedInt};
-use syntax::symbol::{kw, Symbol};
 
 use std::cell::Cell;
 use std::collections::BTreeMap;

src/librustc/ty/query/mod.rs

@@ -47,6 +47,7 @@ use rustc_data_structures::sync::Lrc;
 use rustc_index::vec::IndexVec;
 use rustc_target::spec::PanicStrategy;
 
+use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
 use std::any::type_name;
 use std::borrow::Cow;
@@ -54,7 +55,6 @@ use std::ops::Deref;
 use std::sync::Arc;
 use syntax::ast;
 use syntax::attr;
-use syntax::symbol::Symbol;
 
 #[macro_use]
 mod plumbing;

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;
 

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::*;
 

src/librustc/ty/query/values.rs

@@ -1,7 +1,7 @@
 use crate::ty::util::NeedsDrop;
 use crate::ty::{self, AdtSizedConstraint, Ty, TyCtxt};
 
-use syntax::symbol::Symbol;
+use rustc_span::symbol::Symbol;
 
 pub(super) trait Value<'tcx>: Sized {
     fn from_cycle_error(tcx: TyCtxt<'tcx>) -> Self;

src/librustc/ty/sty.rs

@@ -20,6 +20,7 @@ use crate::util::captures::Captures;
 use polonius_engine::Atom;
 use rustc_index::vec::Idx;
 use rustc_macros::HashStable;
+use rustc_span::symbol::{kw, Symbol};
 use rustc_target::spec::abi;
 use smallvec::SmallVec;
 use std::borrow::Cow;
@@ -27,7 +28,6 @@ use std::cmp::Ordering;
 use std::marker::PhantomData;
 use std::ops::Range;
 use syntax::ast::{self, Ident};
-use syntax::symbol::{kw, Symbol};
 
 #[derive(
     Clone,

src/librustc/ty/wf.rs

@@ -5,9 +5,9 @@ use crate::middle::lang_items;
 use crate::traits::{self, AssocTypeBoundData};
 use crate::ty::subst::SubstsRef;
 use crate::ty::{self, ToPredicate, Ty, TyCtxt, TypeFoldable};
+use rustc_span::symbol::{kw, Ident};
 use rustc_span::Span;
 use std::iter::once;
-use syntax::symbol::{kw, Ident};
 
 /// Returns the set of obligations needed to make `ty` well-formed.
 /// If `ty` contains unresolved inference variables, this may include

src/librustc/util/common.rs

@@ -7,7 +7,7 @@ use std::fmt::Debug;
 use std::time::{Duration, Instant};
 
 use crate::session::Session;
-use syntax::symbol::{sym, Symbol};
+use rustc_span::symbol::{sym, Symbol};
 
 #[cfg(test)]
 mod tests;

src/librustc_builtin_macros/asm.rs

@@ -5,10 +5,10 @@ use State::*;
 use errors::{DiagnosticBuilder, PResult};
 use rustc_expand::base::*;
 use rustc_parse::parser::Parser;
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, AsmDialect};
 use syntax::ptr::P;
-use syntax::symbol::{kw, sym, Symbol};
 use syntax::token::{self, Token};
 use syntax::tokenstream::{self, TokenStream};
 use syntax::{span_err, struct_span_err};

src/librustc_builtin_macros/assert.rs

@@ -2,11 +2,11 @@ use errors::{Applicability, DiagnosticBuilder};
 
 use rustc_expand::base::*;
 use rustc_parse::parser::Parser;
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 use syntax::ast::{self, *};
 use syntax::print::pprust;
 use syntax::ptr::P;
-use syntax::symbol::{sym, Symbol};
 use syntax::token::{self, TokenKind};
 use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
 

src/librustc_builtin_macros/concat.rs

@@ -1,6 +1,6 @@
 use rustc_expand::base::{self, DummyResult};
+use rustc_span::symbol::Symbol;
 use syntax::ast;
-use syntax::symbol::Symbol;
 use syntax::tokenstream::TokenStream;
 
 use std::string::String;

src/librustc_builtin_macros/deriving/clone.rs

@@ -3,10 +3,10 @@ use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, Expr, GenericArg, Generics, ItemKind, MetaItem, VariantData};
 use syntax::ptr::P;
-use syntax::symbol::{kw, sym, Symbol};
 
 pub fn expand_deriving_clone(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/cmp/eq.rs

@@ -3,10 +3,10 @@ use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, Expr, GenericArg, Ident, MetaItem};
 use syntax::ptr::P;
-use syntax::symbol::{sym, Symbol};
 
 pub fn expand_deriving_eq(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/cmp/ord.rs

@@ -3,10 +3,10 @@ use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::sym;
 use rustc_span::Span;
 use syntax::ast::{self, Expr, MetaItem};
 use syntax::ptr::P;
-use syntax::symbol::sym;
 
 pub fn expand_deriving_ord(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/cmp/partial_eq.rs

@@ -3,10 +3,10 @@ use crate::deriving::generic::*;
 use crate::deriving::{path_local, path_std};
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::sym;
 use rustc_span::Span;
 use syntax::ast::{BinOpKind, Expr, MetaItem};
 use syntax::ptr::P;
-use syntax::symbol::sym;
 
 pub fn expand_deriving_partial_eq(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/cmp/partial_ord.rs

@@ -5,10 +5,10 @@ use crate::deriving::generic::*;
 use crate::deriving::{path_local, path_std, pathvec_std};
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, BinOpKind, Expr, MetaItem};
 use syntax::ptr::P;
-use syntax::symbol::{sym, Symbol};
 
 pub fn expand_deriving_partial_ord(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/debug.rs

@@ -3,11 +3,11 @@ use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::sym;
 use rustc_span::{Span, DUMMY_SP};
 use syntax::ast::{self, Ident};
 use syntax::ast::{Expr, MetaItem};
 use syntax::ptr::P;
-use syntax::symbol::sym;
 
 pub fn expand_deriving_debug(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/decodable.rs

@@ -5,11 +5,11 @@ use crate::deriving::generic::*;
 use crate::deriving::pathvec_std;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::Symbol;
 use rustc_span::Span;
 use syntax::ast;
 use syntax::ast::{Expr, MetaItem, Mutability};
 use syntax::ptr::P;
-use syntax::symbol::Symbol;
 
 pub fn expand_deriving_rustc_decodable(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/default.rs

@@ -3,11 +3,11 @@ use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
 use rustc_expand::base::{Annotatable, DummyResult, ExtCtxt};
+use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
 use syntax::ast::{Expr, MetaItem};
 use syntax::ptr::P;
 use syntax::span_err;
-use syntax::symbol::{kw, sym};
 
 use rustc_error_codes::*;
 

src/librustc_builtin_macros/deriving/encodable.rs

@@ -90,10 +90,10 @@ use crate::deriving::generic::*;
 use crate::deriving::pathvec_std;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::Symbol;
 use rustc_span::Span;
 use syntax::ast::{Expr, ExprKind, MetaItem, Mutability};
 use syntax::ptr::P;
-use syntax::symbol::Symbol;
 
 pub fn expand_deriving_rustc_encodable(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/generic/mod.rs

@@ -182,14 +182,14 @@ use std::iter;
 use std::vec;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::source_map::respan;
+use rustc_span::symbol::{kw, sym, Symbol};
 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;
 
 use ty::{LifetimeBounds, Path, Ptr, PtrTy, Self_, Ty};

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)]

src/librustc_builtin_macros/deriving/hash.rs

@@ -3,10 +3,10 @@ use crate::deriving::generic::*;
 use crate::deriving::{self, path_std, pathvec_std};
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::sym;
 use rustc_span::Span;
 use syntax::ast::{Expr, MetaItem, Mutability};
 use syntax::ptr::P;
-use syntax::symbol::sym;
 
 pub fn expand_deriving_hash(
     cx: &mut ExtCtxt<'_>,

src/librustc_builtin_macros/deriving/mod.rs

@@ -1,10 +1,10 @@
 //! The compiler code necessary to implement the `#[derive]` extensions.
 
 use rustc_expand::base::{Annotatable, ExtCtxt, MultiItemModifier};
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, ItemKind, MetaItem};
 use syntax::ptr::P;
-use syntax::symbol::{sym, Symbol};
 
 macro path_local($x:ident) {
     generic::ty::Path::new_local(stringify!($x))

src/librustc_builtin_macros/env.rs

@@ -4,9 +4,9 @@
 //
 
 use rustc_expand::base::{self, *};
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, GenericArg, Ident};
-use syntax::symbol::{kw, sym, Symbol};
 use syntax::tokenstream::TokenStream;
 
 use std::env;

src/librustc_builtin_macros/format.rs

@@ -8,10 +8,10 @@ use errors::Applicability;
 use errors::DiagnosticBuilder;
 
 use rustc_expand::base::{self, *};
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{MultiSpan, Span};
 use syntax::ast;
 use syntax::ptr::P;
-use syntax::symbol::{sym, Symbol};
 use syntax::token;
 use syntax::tokenstream::TokenStream;
 

src/librustc_builtin_macros/global_allocator.rs

@@ -1,12 +1,12 @@
 use crate::util::check_builtin_macro_attribute;
 
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use syntax::ast::{self, Attribute, Expr, FnHeader, FnSig, Generics, Ident, Param};
 use syntax::ast::{ItemKind, Mutability, Stmt, Ty, TyKind, Unsafety};
 use syntax::expand::allocator::{AllocatorKind, AllocatorMethod, AllocatorTy, ALLOCATOR_METHODS};
 use syntax::ptr::P;
-use syntax::symbol::{kw, sym, Symbol};
 
 pub fn expand(
     ecx: &mut ExtCtxt<'_>,

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;
 

src/librustc_builtin_macros/lib.rs

@@ -15,9 +15,9 @@ use crate::deriving::*;
 
 use rustc_expand::base::{MacroExpanderFn, Resolver, SyntaxExtension, SyntaxExtensionKind};
 use rustc_expand::proc_macro::BangProcMacro;
+use rustc_span::edition::Edition;
+use rustc_span::symbol::sym;
 use syntax::ast::Ident;
-use syntax::edition::Edition;
-use syntax::symbol::sym;
 
 mod asm;
 mod assert;

src/librustc_builtin_macros/proc_macro_harness.rs

@@ -3,6 +3,7 @@ use std::mem;
 use rustc_expand::base::{ExtCtxt, Resolver};
 use rustc_expand::expand::{AstFragment, ExpansionConfig};
 use rustc_span::hygiene::AstPass;
+use rustc_span::symbol::{kw, sym};
 use rustc_span::{Span, DUMMY_SP};
 use smallvec::smallvec;
 use syntax::ast::{self, Ident};
@@ -11,7 +12,6 @@ use syntax::expand::is_proc_macro_attr;
 use syntax::print::pprust;
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::symbol::{kw, sym};
 use syntax::visit::{self, Visitor};
 
 struct ProcMacroDerive {

src/librustc_builtin_macros/source_util.rs

@@ -1,11 +1,11 @@
 use rustc_expand::base::{self, *};
 use rustc_expand::panictry;
 use rustc_parse::{self, new_sub_parser_from_file, parser::Parser, DirectoryOwnership};
+use rustc_span::symbol::Symbol;
 use syntax::ast;
 use syntax::early_buffered_lints::INCOMPLETE_INCLUDE;
 use syntax::print::pprust;
 use syntax::ptr::P;
-use syntax::symbol::Symbol;
 use syntax::token;
 use syntax::tokenstream::TokenStream;
 

src/librustc_builtin_macros/standard_library_imports.rs

@@ -1,11 +1,11 @@
 use rustc_expand::base::{ExtCtxt, Resolver};
 use rustc_expand::expand::ExpansionConfig;
+use rustc_span::edition::Edition;
 use rustc_span::hygiene::AstPass;
+use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::DUMMY_SP;
-use syntax::edition::Edition;
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::symbol::{kw, sym, Ident, Symbol};
 use syntax::{ast, attr};
 
 pub fn inject(

src/librustc_builtin_macros/test.rs

@@ -3,12 +3,12 @@
 use crate::util::check_builtin_macro_attribute;
 
 use rustc_expand::base::*;
+use rustc_span::source_map::respan;
+use rustc_span::symbol::{sym, Symbol};
 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;
 

src/librustc_builtin_macros/test_harness.rs

@@ -5,6 +5,8 @@ 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::symbol::{sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::PanicStrategy;
 use smallvec::{smallvec, SmallVec};
@@ -14,8 +16,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};
 

src/librustc_builtin_macros/trace_macros.rs

@@ -1,6 +1,6 @@
 use rustc_expand::base::{self, ExtCtxt};
+use rustc_span::symbol::kw;
 use rustc_span::Span;
-use syntax::symbol::kw;
 use syntax::tokenstream::{TokenStream, TokenTree};
 
 pub fn expand_trace_macros(

src/librustc_codegen_llvm/back/archive.rs

@@ -12,7 +12,7 @@ use crate::llvm::{self, ArchiveKind};
 use rustc::session::Session;
 use rustc_codegen_ssa::back::archive::{find_library, ArchiveBuilder};
 use rustc_codegen_ssa::{looks_like_rust_object_file, METADATA_FILENAME, RLIB_BYTECODE_EXTENSION};
-use syntax::symbol::Symbol;
+use rustc_span::symbol::Symbol;
 
 struct ArchiveConfig<'a> {
     pub sess: &'a Session,

src/librustc_codegen_llvm/common.rs

@@ -18,8 +18,8 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
 
 use libc::{c_char, c_uint};
 
+use rustc_span::symbol::Symbol;
 use syntax::ast::Mutability;
-use syntax::symbol::Symbol;
 
 pub use crate::context::CodegenCx;
 

src/librustc_codegen_llvm/consts.rs

@@ -14,9 +14,9 @@ use rustc::mir::mono::MonoItem;
 use rustc::ty::{self, Instance, Ty};
 use rustc::{bug, span_bug};
 use rustc_codegen_ssa::traits::*;
+use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use rustc_target::abi::HasDataLayout;
-use syntax::symbol::{sym, Symbol};
 
 use rustc::ty::layout::{self, Align, LayoutOf, Size};
 

src/librustc_codegen_llvm/context.rs

@@ -27,13 +27,13 @@ use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_target::spec::{HasTargetSpec, Target};
 
 use crate::abi::Abi;
+use rustc_span::source_map::{Span, DUMMY_SP};
+use rustc_span::symbol::Symbol;
 use std::cell::{Cell, RefCell};
 use std::ffi::CStr;
 use std::iter;
 use std::str;
 use std::sync::Arc;
-use syntax::source_map::{Span, DUMMY_SP};
-use syntax::symbol::Symbol;
 
 /// There is one `CodegenCx` per compilation unit. Each one has its own LLVM
 /// `llvm::Context` so that several compilation units may be optimized in parallel.

src/librustc_codegen_llvm/debuginfo/gdb.rs

@@ -9,8 +9,8 @@ use rustc::bug;
 use rustc::session::config::DebugInfo;
 use rustc_codegen_ssa::traits::*;
 
+use rustc_span::symbol::sym;
 use syntax::attr;
-use syntax::symbol::sym;
 
 /// Inserts a side-effect free instruction sequence that makes sure that the
 /// .debug_gdb_scripts global is referenced, so it isn't removed by the linker.

src/librustc_codegen_llvm/debuginfo/metadata.rs

@@ -42,10 +42,10 @@ use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_fs_util::path_to_c_string;
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_span::symbol::{Interner, Symbol};
 use rustc_span::{self, FileName, Span};
 use rustc_target::abi::HasDataLayout;
 use syntax::ast;
-use syntax::symbol::{Interner, Symbol};
 
 use libc::{c_longlong, c_uint};
 use std::collections::hash_map::Entry;

src/librustc_codegen_llvm/debuginfo/mod.rs

@@ -37,10 +37,10 @@ use std::ffi::CString;
 
 use rustc::ty::layout::{self, HasTyCtxt, LayoutOf, Size};
 use rustc_codegen_ssa::traits::*;
+use rustc_span::symbol::Symbol;
 use rustc_span::{self, BytePos, Pos, Span};
 use smallvec::SmallVec;
 use syntax::ast;
-use syntax::symbol::Symbol;
 
 mod create_scope_map;
 pub mod gdb;

src/librustc_codegen_llvm/llvm_util.rs

@@ -6,10 +6,10 @@ use rustc::session::config::PrintRequest;
 use rustc::session::Session;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_feature::UnstableFeatures;
+use rustc_span::symbol::sym;
 use rustc_span::symbol::Symbol;
 use rustc_target::spec::{MergeFunctions, PanicStrategy};
 use std::ffi::CString;
-use syntax::symbol::sym;
 
 use std::slice;
 use std::str;

src/librustc_codegen_ssa/back/archive.rs

@@ -1,5 +1,5 @@
 use rustc::session::Session;
-use syntax::symbol::Symbol;
+use rustc_span::symbol::Symbol;
 
 use std::io;
 use std::path::{Path, PathBuf};

src/librustc_codegen_ssa/back/command.rs

@@ -7,8 +7,8 @@ use std::io;
 use std::mem;
 use std::process::{self, Output};
 
+use rustc_span::symbol::Symbol;
 use rustc_target::spec::LldFlavor;
-use syntax::symbol::Symbol;
 
 #[derive(Clone)]
 pub struct Command {

src/librustc_codegen_ssa/back/link.rs

@@ -11,8 +11,8 @@ use rustc::session::{filesearch, Session};
 use rustc::util::common::{time, time_ext};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_fs_util::fix_windows_verbatim_for_gcc;
+use rustc_span::symbol::Symbol;
 use rustc_target::spec::{LinkerFlavor, PanicStrategy, RelroLevel};
-use syntax::symbol::Symbol;
 
 use super::archive::ArchiveBuilder;
 use super::command::Command;

src/librustc_codegen_ssa/back/linker.rs

@@ -15,8 +15,8 @@ use rustc::session::config::{self, CrateType, DebugInfo, LinkerPluginLto, Lto, O
 use rustc::session::Session;
 use rustc::ty::TyCtxt;
 use rustc_serialize::{json, Encoder};
+use rustc_span::symbol::Symbol;
 use rustc_target::spec::{LinkerFlavor, LldFlavor};
-use syntax::symbol::Symbol;
 
 /// For all the linkers we support, and information they might
 /// need out of the shared crate context before we get rid of it.

src/librustc_codegen_ssa/mir/block.rs

@@ -1,27 +1,26 @@
+use super::operand::OperandRef;
+use super::operand::OperandValue::{Immediate, Pair, Ref};
+use super::place::PlaceRef;
+use super::{FunctionCx, LocalRef};
+
 use crate::base;
 use crate::common::{self, IntPredicate};
 use crate::meth;
+use crate::traits::*;
 use crate::MemFlags;
+
 use rustc::middle::lang_items;
 use rustc::mir::interpret::PanicInfo;
 use rustc::mir::{self, PlaceBase, Static, StaticKind};
 use rustc::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf};
 use rustc::ty::{self, Instance, Ty, TypeFoldable};
 use rustc_index::vec::Idx;
+use rustc_span::{source_map::Span, symbol::Symbol};
 use rustc_target::abi::call::{ArgAbi, FnAbi, PassMode};
 use rustc_target::spec::abi::Abi;
 
-use crate::traits::*;
-
 use std::borrow::Cow;
 
-use syntax::{source_map::Span, symbol::Symbol};
-
-use super::operand::OperandRef;
-use super::operand::OperandValue::{Immediate, Pair, Ref};
-use super::place::PlaceRef;
-use super::{FunctionCx, LocalRef};
-
 /// Used by `FunctionCx::codegen_terminator` for emitting common patterns
 /// e.g., creating a basic block, calling a function, etc.
 struct TerminatorCodegenHelper<'tcx> {

src/librustc_codegen_ssa/mir/constant.rs

@@ -5,7 +5,7 @@ use rustc::mir::interpret::ErrorHandled;
 use rustc::ty::layout::{self, HasTyCtxt};
 use rustc::ty::{self, Ty};
 use rustc_index::vec::Idx;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use super::FunctionCx;
 

src/librustc_codegen_ssa/mir/debuginfo.rs

@@ -6,8 +6,8 @@ use rustc::ty::layout::{LayoutOf, Size};
 use rustc::ty::TyCtxt;
 use rustc_index::vec::IndexVec;
 
+use rustc_span::symbol::kw;
 use rustc_span::{BytePos, Span};
-use syntax::symbol::kw;
 
 use super::OperandValue;
 use super::{FunctionCx, LocalRef};

src/librustc_codegen_ssa/mir/rvalue.rs

@@ -13,8 +13,8 @@ use rustc::ty::cast::{CastTy, IntTy};
 use rustc::ty::layout::{self, HasTyCtxt, LayoutOf};
 use rustc::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt};
 use rustc_apfloat::{ieee, Float, Round, Status};
-use syntax::source_map::{Span, DUMMY_SP};
-use syntax::symbol::sym;
+use rustc_span::source_map::{Span, DUMMY_SP};
+use rustc_span::symbol::sym;
 
 use std::{i128, u128};
 

src/librustc_codegen_utils/codegen_backend.rs

@@ -15,7 +15,7 @@ use rustc::session::Session;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
 use rustc::util::common::ErrorReported;
-use syntax::symbol::Symbol;
+use rustc_span::symbol::Symbol;
 
 pub use rustc_data_structures::sync::MetadataRef;
 

src/librustc_codegen_utils/lib.rs

@@ -18,7 +18,7 @@ extern crate rustc;
 use rustc::hir::def_id::{DefId, LOCAL_CRATE};
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
-use syntax::symbol::sym;
+use rustc_span::symbol::sym;
 
 pub mod codegen_backend;
 pub mod link;

src/librustc_codegen_utils/link.rs

@@ -1,8 +1,8 @@
 use rustc::session::config::{self, Input, OutputFilenames, OutputType};
 use rustc::session::Session;
+use rustc_span::symbol::sym;
 use rustc_span::Span;
 use std::path::{Path, PathBuf};
-use syntax::symbol::sym;
 use syntax::{ast, attr};
 
 pub fn out_filename(

src/librustc_codegen_utils/symbol_names_test.rs

@@ -6,7 +6,7 @@
 
 use rustc::hir;
 use rustc::ty::{Instance, TyCtxt};
-use syntax::symbol::{sym, Symbol};
+use rustc_span::symbol::{sym, Symbol};
 
 const SYMBOL_NAME: Symbol = sym::rustc_symbol_name;
 const DEF_PATH: Symbol = sym::rustc_def_path;

src/librustc_expand/base.rs

@@ -1,14 +1,14 @@
 use crate::expand::{self, AstFragment, Invocation};
 
 use rustc_parse::{self, parser, DirectoryOwnership, MACRO_ARGUMENTS};
+use rustc_span::edition::Edition;
+use rustc_span::source_map::SourceMap;
+use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use syntax::ast::{self, Attribute, Name, NodeId, PatKind};
 use syntax::attr::{self, Deprecation, HasAttrs, Stability};
-use syntax::edition::Edition;
 use syntax::mut_visit::{self, MutVisitor};
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::source_map::SourceMap;
-use syntax::symbol::{kw, sym, Ident, Symbol};
 use syntax::token;
 use syntax::tokenstream::{self, TokenStream};
 use syntax::visit::Visitor;

src/librustc_expand/build.rs

@@ -1,10 +1,10 @@
 use crate::base::ExtCtxt;
 
+use rustc_span::source_map::{respan, Spanned};
+use rustc_span::symbol::{kw, sym, Symbol};
 use syntax::ast::{self, AttrVec, BlockCheckMode, Expr, Ident, PatKind, UnOp};
 use syntax::attr;
 use syntax::ptr::P;
-use syntax::source_map::{respan, Spanned};
-use syntax::symbol::{kw, sym, Symbol};
 
 use rustc_span::{Pos, Span};
 

src/librustc_expand/expand.rs

@@ -10,6 +10,9 @@ use rustc_parse::configure;
 use rustc_parse::parser::Parser;
 use rustc_parse::validate_attr;
 use rustc_parse::DirectoryOwnership;
+use rustc_span::source_map::respan;
+use rustc_span::symbol::{sym, Symbol};
+use rustc_span::{FileName, Span, DUMMY_SP};
 use syntax::ast::{self, AttrItem, Block, Ident, LitKind, NodeId, PatKind, Path};
 use syntax::ast::{ItemKind, MacArgs, MacStmtStyle, StmtKind};
 use syntax::attr::{self, is_builtin_attr, HasAttrs};
@@ -18,15 +21,12 @@ use syntax::mut_visit::*;
 use syntax::print::pprust;
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::source_map::respan;
-use syntax::symbol::{sym, Symbol};
 use syntax::token;
 use syntax::tokenstream::{TokenStream, TokenTree};
 use syntax::util::map_in_place::MapInPlace;
 use syntax::visit::{self, Visitor};
 
 use errors::{Applicability, FatalError, PResult};
-use rustc_span::{FileName, Span, DUMMY_SP};
 use smallvec::{smallvec, SmallVec};
 
 use rustc_data_structures::sync::Lrc;

src/librustc_expand/mbe/macro_check.rs

@@ -106,10 +106,10 @@
 //! bound.
 use crate::mbe::{KleeneToken, TokenTree};
 
+use rustc_span::symbol::{kw, sym};
 use syntax::ast::NodeId;
 use syntax::early_buffered_lints::META_VARIABLE_MISUSE;
 use syntax::sess::ParseSess;
-use syntax::symbol::{kw, sym};
 use syntax::token::{DelimToken, Token, TokenKind};
 
 use rustc_data_structures::fx::FxHashMap;

src/librustc_expand/mbe/macro_parser.rs

@@ -78,10 +78,10 @@ use crate::mbe::{self, TokenTree};
 
 use rustc_parse::parser::{FollowedByType, Parser, PathStyle};
 use rustc_parse::Directory;
+use rustc_span::symbol::{kw, sym, Symbol};
 use syntax::ast::{Ident, Name};
 use syntax::print::pprust;
 use syntax::sess::ParseSess;
-use syntax::symbol::{kw, sym, Symbol};
 use syntax::token::{self, DocComment, Nonterminal, Token};
 use syntax::tokenstream::TokenStream;
 

src/librustc_expand/mbe/macro_rules.rs

@@ -11,14 +11,14 @@ use crate::mbe::transcribe::transcribe;
 use rustc_feature::Features;
 use rustc_parse::parser::Parser;
 use rustc_parse::Directory;
+use rustc_span::edition::Edition;
 use rustc_span::hygiene::Transparency;
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use syntax::ast;
 use syntax::attr::{self, TransparencyError};
-use syntax::edition::Edition;
 use syntax::print::pprust;
 use syntax::sess::ParseSess;
-use syntax::symbol::{kw, sym, Symbol};
 use syntax::token::{self, NtTT, Token, TokenKind::*};
 use syntax::tokenstream::{DelimSpan, TokenStream};