Rollup merge of rust-lang#67786 - Centril:canon-span, r=petrochenkov

Nix reexports from `rustc_span` in `syntax`

Remove reexports `syntax::{source_map, symbol, edition}` and use `rustc_span` paths directly.

r? @petrochenkov

Author: Centril

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_error_codes::*;
+use rustc_span::symbol::sym;
 use rustc_span::Span;
-use std::fmt::{self, Display};
-use syntax::{attr, symbol::sym};
+use syntax::attr;
 
-use rustc_error_codes::*;
+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,12 +1,12 @@
+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;
 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;