mv (mod) codemap source_map

Author: dsciarra

src/librustc/hir/lowering.rs

@@ -68,7 +68,7 @@ use syntax::errors;
 use syntax::ext::hygiene::{Mark, SyntaxContext};
 use syntax::print::pprust;
 use syntax::ptr::P;
-use syntax::codemap::{self, respan, CompilerDesugaringKind, Spanned};
+use syntax::source_map::{self, respan, CompilerDesugaringKind, Spanned};
 use syntax::std_inject;
 use syntax::symbol::{keywords, Symbol};
 use syntax::tokenstream::{Delimited, TokenStream, TokenTree};
@@ -614,14 +614,14 @@ impl<'a> LoweringContext<'a> {
 
     fn allow_internal_unstable(&self, reason: CompilerDesugaringKind, span: Span) -> Span {
         let mark = Mark::fresh(Mark::root());
-        mark.set_expn_info(codemap::ExpnInfo {
+        mark.set_expn_info(source_map::ExpnInfo {
             call_site: span,
             def_site: Some(span),
-            format: codemap::CompilerDesugaring(reason),
+            format: source_map::CompilerDesugaring(reason),
             allow_internal_unstable: true,
             allow_internal_unsafe: false,
             local_inner_macros: false,
-            edition: codemap::hygiene::default_edition(),
+            edition: source_map::hygiene::default_edition(),
         });
         span.with_ctxt(SyntaxContext::empty().apply_mark(mark))
     }

src/librustc/hir/map/collector.rs

@@ -18,7 +18,7 @@ use middle::cstore::CrateStore;
 use session::CrateDisambiguator;
 use std::iter::repeat;
 use syntax::ast::{NodeId, CRATE_NODE_ID};
-use syntax::codemap::SourceMap;
+use syntax::source_map::SourceMap;
 use syntax_pos::Span;
 
 use ich::StableHashingContext;

src/librustc/hir/map/mod.rs

@@ -24,7 +24,7 @@ use middle::cstore::CrateStore;
 use rustc_target::spec::abi::Abi;
 use rustc_data_structures::svh::Svh;
 use syntax::ast::{self, Name, NodeId, CRATE_NODE_ID};
-use syntax::codemap::Spanned;
+use syntax::source_map::Spanned;
 use syntax::ext::base::MacroKind;
 use syntax_pos::{Span, DUMMY_SP};
 

src/librustc/hir/mod.rs

@@ -24,7 +24,7 @@ use util::nodemap::{NodeMap, FxHashSet};
 use mir::mono::Linkage;
 
 use syntax_pos::{Span, DUMMY_SP, symbol::InternedString};
-use syntax::codemap::{self, Spanned};
+use syntax::source_map::{self, Spanned};
 use rustc_target::spec::abi::Abi;
 use syntax::ast::{self, CrateSugar, Ident, Name, NodeId, DUMMY_NODE_ID, AsmDialect};
 use syntax::ast::{Attribute, Lit, StrStyle, FloatTy, IntTy, UintTy, MetaItem};
@@ -1100,7 +1100,7 @@ pub type Stmt = Spanned<StmtKind>;
 impl fmt::Debug for StmtKind {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // Sadness.
-        let spanned = codemap::dummy_spanned(self.clone());
+        let spanned = source_map::dummy_spanned(self.clone());
         write!(f,
                "stmt({}: {})",
                spanned.node.id(),

src/librustc/hir/print.rs

@@ -12,7 +12,7 @@ pub use self::AnnNode::*;
 
 use rustc_target::spec::abi::Abi;
 use syntax::ast;
-use syntax::codemap::{SourceMap, Spanned};
+use syntax::source_map::{SourceMap, Spanned};
 use syntax::parse::ParseSess;
 use syntax::parse::lexer::comments;
 use syntax::print::pp::{self, Breaks};

src/librustc/ich/caching_codemap_view.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use rustc_data_structures::sync::Lrc;
-use syntax::codemap::SourceMap;
+use syntax::source_map::SourceMap;
 use syntax_pos::{BytePos, SourceFile};
 
 #[derive(Clone)]

src/librustc/ich/hcx.rs

@@ -25,7 +25,7 @@ use std::cell::RefCell;
 
 use syntax::ast;
 
-use syntax::codemap::SourceMap;
+use syntax::source_map::SourceMap;
 use syntax::ext::hygiene::SyntaxContext;
 use syntax::symbol::Symbol;
 use syntax_pos::{Span, DUMMY_SP};

src/librustc/infer/canonical/mod.rs

@@ -37,7 +37,7 @@ use rustc_data_structures::small_vec::SmallVec;
 use rustc_data_structures::sync::Lrc;
 use serialize::UseSpecializedDecodable;
 use std::ops::Index;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 use ty::fold::TypeFoldable;
 use ty::subst::Kind;
 use ty::{self, CanonicalVar, Lift, Region, Slice, TyCtxt};

src/librustc/infer/error_reporting/need_type_info.rs

@@ -13,7 +13,7 @@ use hir::intravisit::{self, Visitor, NestedVisitorMap};
 use infer::InferCtxt;
 use infer::type_variable::TypeVariableOrigin;
 use ty::{self, Ty, TyInfer, TyVar};
-use syntax::codemap::CompilerDesugaringKind;
+use syntax::source_map::CompilerDesugaringKind;
 use syntax_pos::Span;
 use errors::DiagnosticBuilder;
 

src/librustc/infer/error_reporting/nice_region_error/mod.rs

@@ -11,7 +11,7 @@
 use infer::InferCtxt;
 use infer::lexical_region_resolve::RegionResolutionError;
 use infer::lexical_region_resolve::RegionResolutionError::*;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 use ty::{self, TyCtxt};
 use util::common::ErrorReported;
 

src/librustc/lint/builtin.rs

@@ -18,7 +18,7 @@ use errors::{Applicability, DiagnosticBuilder};
 use lint::{LintPass, LateLintPass, LintArray};
 use session::Session;
 use syntax::ast;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 
 declare_lint! {
     pub EXCEEDING_BITSHIFTS,

src/librustc/lint/levels.rs

@@ -21,7 +21,7 @@ use rustc_data_structures::stable_hasher::{HashStable, ToStableHashKey,
 use session::Session;
 use syntax::ast;
 use syntax::attr;
-use syntax::codemap::MultiSpan;
+use syntax::source_map::MultiSpan;
 use syntax::feature_gate;
 use syntax::symbol::Symbol;
 use util::nodemap::FxHashMap;

src/librustc/lint/mod.rs

@@ -42,7 +42,7 @@ use lint::builtin::parser::QUESTION_MARK_MACRO_SEP;
 use session::{Session, DiagnosticMessageId};
 use std::{hash, ptr};
 use syntax::ast;
-use syntax::codemap::{MultiSpan, ExpnFormat};
+use syntax::source_map::{MultiSpan, ExpnFormat};
 use syntax::early_buffered_lints::BufferedEarlyLintId;
 use syntax::edition::Edition;
 use syntax::symbol::Symbol;

src/librustc/macros.rs

@@ -147,7 +147,7 @@ macro_rules! impl_stable_hash_for {
 macro_rules! impl_stable_hash_for_spanned {
     ($T:path) => (
 
-        impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for ::syntax::codemap::Spanned<$T>
+        impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for ::syntax::source_map::Spanned<$T>
         {
             #[inline]
             fn hash_stable<W: StableHasherResult>(&self,

src/librustc/middle/dead.rs

@@ -24,7 +24,7 @@ use middle::privacy;
 use ty::{self, TyCtxt};
 use util::nodemap::FxHashSet;
 
-use syntax::{ast, codemap};
+use syntax::{ast, source_map};
 use syntax::attr;
 use syntax_pos;
 
@@ -115,7 +115,7 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
     }
 
     fn handle_field_pattern_match(&mut self, lhs: &hir::Pat, def: Def,
-                                  pats: &[codemap::Spanned<hir::FieldPat>]) {
+                                  pats: &[source_map::Spanned<hir::FieldPat>]) {
         let variant = match self.tables.node_id_to_type(lhs.hir_id).sty {
             ty::TyAdt(adt, _) => adt.variant_of_def(def),
             _ => span_bug!(lhs.span, "non-ADT in struct pattern")

src/librustc/middle/region.rs

@@ -23,7 +23,7 @@ use ty;
 use std::fmt;
 use std::mem;
 use rustc_data_structures::sync::Lrc;
-use syntax::codemap;
+use syntax::source_map;
 use syntax::ast;
 use syntax_pos::{Span, DUMMY_SP};
 use ty::TyCtxt;
@@ -943,11 +943,15 @@ fn resolve_expr<'a, 'tcx>(visitor: &mut RegionResolutionVisitor<'a, 'tcx>, expr:
             // scopes, meaning that temporaries cannot outlive them.
             // This ensures fixed size stacks.
 
-            hir::ExprKind::Binary(codemap::Spanned { node: hir::BinOpKind::And, .. }, _, ref r) |
-            hir::ExprKind::Binary(codemap::Spanned { node: hir::BinOpKind::Or, .. }, _, ref r) => {
-                // For shortcircuiting operators, mark the RHS as a terminating
-                // scope since it only executes conditionally.
-                terminating(r.hir_id.local_id);
+            hir::ExprKind::Binary(
+                source_map::Spanned { node: hir::BinOpKind::And, .. },
+                _, ref r) |
+            hir::ExprKind::Binary(
+                source_map::Spanned { node: hir::BinOpKind::Or, .. },
+                _, ref r) => {
+                    // For shortcircuiting operators, mark the RHS as a terminating
+                    // scope since it only executes conditionally.
+                    terminating(r.hir_id.local_id);
             }
 
             hir::ExprKind::If(ref expr, ref then, Some(ref otherwise)) => {

src/librustc/session/config.rs

@@ -22,7 +22,7 @@ use lint;
 use middle::cstore;
 
 use syntax::ast::{self, IntTy, UintTy};
-use syntax::codemap::{FileName, FilePathMapping};
+use syntax::source_map::{FileName, FilePathMapping};
 use syntax::edition::{Edition, EDITION_NAME_LIST, DEFAULT_EDITION};
 use syntax::parse::token;
 use syntax::parse;

src/librustc/session/mod.rs

@@ -35,7 +35,7 @@ use syntax::json::JsonEmitter;
 use syntax::feature_gate;
 use syntax::parse;
 use syntax::parse::ParseSess;
-use syntax::{ast, codemap};
+use syntax::{ast, source_map};
 use syntax::feature_gate::AttributeType;
 use syntax_pos::{MultiSpan, Span};
 use util::profiling::SelfProfiler;
@@ -484,7 +484,7 @@ impl Session {
         );
     }
 
-    pub fn codemap<'a>(&'a self) -> &'a codemap::SourceMap {
+    pub fn codemap<'a>(&'a self) -> &'a source_map::SourceMap {
         self.parse_sess.codemap()
     }
     pub fn verbose(&self) -> bool {
@@ -984,7 +984,7 @@ pub fn build_session(
         sopts,
         local_crate_source_file,
         registry,
-        Lrc::new(codemap::SourceMap::new(file_path_mapping)),
+        Lrc::new(source_map::SourceMap::new(file_path_mapping)),
         None,
     )
 }
@@ -993,7 +993,7 @@ pub fn build_session_with_codemap(
     sopts: config::Options,
     local_crate_source_file: Option<PathBuf>,
     registry: errors::registry::Registry,
-    codemap: Lrc<codemap::SourceMap>,
+    codemap: Lrc<source_map::SourceMap>,
     emitter_dest: Option<Box<dyn Write + Send>>,
 ) -> Session {
     // FIXME: This is not general enough to make the warning lint completely override
@@ -1070,7 +1070,7 @@ pub fn build_session_(
     sopts: config::Options,
     local_crate_source_file: Option<PathBuf>,
     span_diagnostic: errors::Handler,
-    codemap: Lrc<codemap::SourceMap>,
+    codemap: Lrc<source_map::SourceMap>,
 ) -> Session {
     let host_triple = TargetTriple::from_triple(config::host_triple());
     let host = match Target::search(&host_triple) {

src/librustc/traits/query/dropck_outlives.rs

@@ -12,7 +12,7 @@ use infer::at::At;
 use infer::InferOk;
 use rustc_data_structures::small_vec::SmallVec;
 use std::iter::FromIterator;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 use ty::subst::Kind;
 use ty::{self, Ty, TyCtxt};
 

src/librustc/traits/query/outlives_bounds.rs

@@ -10,7 +10,7 @@
 
 use infer::InferCtxt;
 use syntax::ast;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 use rustc_data_structures::small_vec::SmallVec;
 use traits::{FulfillmentContext, ObligationCause, TraitEngine, TraitEngineExt};
 use traits::query::NoSolution;

src/librustc/traits/query/type_op/custom.rs

@@ -15,7 +15,7 @@ use traits::query::Fallible;
 use infer::canonical::query_result;
 use infer::canonical::QueryRegionConstraint;
 use std::rc::Rc;
-use syntax::codemap::DUMMY_SP;
+use syntax::source_map::DUMMY_SP;
 use traits::{ObligationCause, TraitEngine, TraitEngineExt};
 
 pub struct CustomTypeOp<F, G> {

src/librustc/ty/context.rs

@@ -73,7 +73,7 @@ use std::sync::Arc;
 use rustc_target::spec::abi;
 use syntax::ast::{self, NodeId};
 use syntax::attr;
-use syntax::codemap::MultiSpan;
+use syntax::source_map::MultiSpan;
 use syntax::edition::Edition;
 use syntax::feature_gate;
 use syntax::symbol::{Symbol, keywords, InternedString};

src/librustc/ty/query/on_disk_cache.rs

@@ -26,7 +26,7 @@ use rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque,
 use session::{CrateDisambiguator, Session};
 use std::mem;
 use syntax::ast::NodeId;
-use syntax::codemap::{SourceMap, StableFilemapId};
+use syntax::source_map::{SourceMap, StableFilemapId};
 use syntax_pos::{BytePos, Span, DUMMY_SP, SourceFile};
 use syntax_pos::hygiene::{Mark, SyntaxContext, ExpnInfo};
 use ty;

src/librustc/ty/query/plumbing.rs

@@ -32,7 +32,7 @@ use std::mem;
 use std::ptr;
 use std::collections::hash_map::Entry;
 use syntax_pos::Span;
-use syntax::codemap::DUMMY_SP;
+use syntax::source_map::DUMMY_SP;
 
 pub struct QueryCache<'tcx, D: QueryConfig<'tcx> + ?Sized> {
     pub(super) results: FxHashMap<D::Key, QueryValue<D::Value>>,

src/librustc_allocator/expand.rs

@@ -17,7 +17,7 @@ use syntax::{
         Mac, Mod, Mutability, Ty, TyKind, Unsafety, VisibilityKind,
     },
     attr,
-    codemap::{
+    source_map::{
         respan, ExpnInfo, MacroAttribute,
     },
     ext::{

src/librustc_codegen_llvm/mir/constant.rs

@@ -25,7 +25,7 @@ use consts;
 use type_of::LayoutLlvmExt;
 use type_::Type;
 use syntax::ast::Mutability;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 use value::Value;
 
 use super::super::callee;

src/librustc_driver/lib.rs

@@ -107,7 +107,7 @@ use std::sync::{Once, ONCE_INIT};
 use std::thread;
 
 use syntax::ast;
-use syntax::codemap::{SourceMap, FileLoader, RealFileLoader};
+use syntax::source_map::{SourceMap, FileLoader, RealFileLoader};
 use syntax::feature_gate::{GatedCfg, UnstableFeatures};
 use syntax::parse::{self, PResult};
 use syntax_pos::{DUMMY_SP, MultiSpan, FileName};

src/librustc_driver/test.rs

@@ -32,7 +32,7 @@ use rustc_data_structures::sync::{self, Lrc};
 use syntax;
 use syntax::ast;
 use rustc_target::spec::abi::Abi;
-use syntax::codemap::{SourceMap, FilePathMapping, FileName};
+use syntax::source_map::{SourceMap, FilePathMapping, FileName};
 use errors;
 use errors::emitter::Emitter;
 use errors::{Level, DiagnosticBuilder};

src/librustc_lint/builtin.rs

@@ -45,7 +45,7 @@ use rustc::util::nodemap::FxHashSet;
 use syntax::tokenstream::{TokenTree, TokenStream};
 use syntax::ast;
 use syntax::attr;
-use syntax::codemap::Spanned;
+use syntax::source_map::Spanned;
 use syntax::edition::Edition;
 use syntax::feature_gate::{AttributeGate, AttributeType, Stability, deprecated_attributes};
 use syntax_pos::{BytePos, Span, SyntaxContext};

src/librustc_lint/types.rs

@@ -25,7 +25,7 @@ use syntax::{ast, attr};
 use syntax::errors::Applicability;
 use rustc_target::spec::abi::Abi;
 use syntax_pos::Span;
-use syntax::codemap;
+use syntax::source_map;
 
 use rustc::hir;
 
@@ -208,7 +208,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
         }
 
         fn rev_binop(binop: hir::BinOp) -> hir::BinOp {
-            codemap::respan(binop.span,
+            source_map::respan(binop.span,
                             match binop.node {
                                 hir::BinOpKind::Lt => hir::BinOpKind::Gt,
                                 hir::BinOpKind::Le => hir::BinOpKind::Ge,

src/librustc_metadata/cstore_impl.rs

@@ -38,7 +38,7 @@ use std::sync::Arc;
 
 use syntax::ast;
 use syntax::attr;
-use syntax::codemap;
+use syntax::source_map;
 use syntax::edition::Edition;
 use syntax::parse::source_file_to_stream;
 use syntax::symbol::Symbol;
@@ -487,7 +487,7 @@ impl cstore::CStore {
                 tokens: body.into(),
                 legacy: def.legacy,
             }),
-            vis: codemap::respan(local_span.shrink_to_lo(), ast::VisibilityKind::Inherited),
+            vis: source_map::respan(local_span.shrink_to_lo(), ast::VisibilityKind::Inherited),
             tokens: None,
         })
     }