Auto merge of #52953 - dsciarra:mv-codemap-sourcemap, r=petrochenkov

Rename CodeMap/FileMap to SourceMap/SourceFile

A first renaming for #51574

src/test/compile-fail-fulldeps/qquote.rs

@@ -16,7 +16,7 @@ extern crate syntax;
 extern crate syntax_pos;
 
 use syntax::ast;
-use syntax::codemap::FilePathMapping;
+use syntax::source_map::FilePathMapping;
 use syntax::print::pprust;
 use syntax::symbol::Symbol;
 use syntax_pos::DUMMY_SP;

src/test/incremental/remove_source_file/main.rs

@@ -13,7 +13,7 @@
 
 // revisions:cfail1 cfail2
 
-// Note that we specify -g so that the FileMaps actually get referenced by the
+// Note that we specify -g so that the SourceFiles actually get referenced by the
 // incr. comp. cache:
 // compile-flags: -Z query-dep-graph -g
 // compile-pass

src/test/incremental/span_hash_stable/main.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // This test makes sure that it doesn't make a difference in which order we are
-// adding source files to the codemap. The order affects the BytePos values of
+// adding source files to the source_map. The order affects the BytePos values of
 // the spans and this test makes sure that we handle them correctly by hashing
 // file:line:column instead of raw byte offset.
 

src/test/run-fail-fulldeps/qquote.rs

@@ -18,7 +18,7 @@ extern crate syntax;
 extern crate syntax_pos;
 
 use syntax::ast;
-use syntax::codemap;
+use syntax::source_map;
 use syntax::print::pprust;
 use syntax::symbol::Symbol;
 use syntax_pos::DUMMY_SP;
@@ -28,7 +28,7 @@ fn main() {
 }
 
 fn run() {
-    let ps = syntax::parse::ParseSess::new(codemap::FilePathMapping::empty());
+    let ps = syntax::parse::ParseSess::new(source_map::FilePathMapping::empty());
     let mut resolver = syntax::ext::base::DummyResolver;
     let mut cx = syntax::ext::base::ExtCtxt::new(
         &ps,

src/test/run-make-fulldeps/issue-19371/foo.rs

@@ -24,7 +24,7 @@ use rustc::session::config::{Input, Options,
 use rustc_driver::driver::{self, compile_input, CompileController};
 use rustc_metadata::cstore::CStore;
 use rustc_errors::registry::Registry;
-use syntax::codemap::FileName;
+use syntax::source_map::FileName;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 
 use std::path::PathBuf;

src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs

@@ -17,7 +17,7 @@ extern crate syntax;
 use syntax::ast::*;
 use syntax::attr::*;
 use syntax::ast;
-use syntax::codemap::{FilePathMapping, FileName};
+use syntax::source_map::{FilePathMapping, FileName};
 use syntax::parse;
 use syntax::parse::{ParseSess, PResult};
 use syntax::parse::new_parser_from_source_str;

src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs

@@ -22,7 +22,7 @@ use deriving::generic::ty::*;
 
 use rustc_plugin::Registry;
 use syntax::ast::*;
-use syntax::codemap::Span;
+use syntax::source_map::Span;
 use syntax::ext::base::*;
 use syntax::ext::build::AstBuilder;
 use syntax::symbol::Symbol;

src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs

@@ -18,7 +18,7 @@ extern crate rustc_plugin;
 extern crate syntax_pos;
 
 use syntax::ast::{self, Item, MetaItem, ItemKind};
-use syntax::codemap::DUMMY_SP;
+use syntax::source_map::DUMMY_SP;
 use syntax::ext::base::*;
 use syntax::ext::quote::rt::ToTokens;
 use syntax::parse::{self, token};

src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs

@@ -16,7 +16,7 @@
 extern crate syntax;
 
 use std::path::Path;
-use syntax::codemap::FilePathMapping;
+use syntax::source_map::FilePathMapping;
 use syntax::parse::{self, ParseSess};
 
 #[path = "mod_dir_simple/test.rs"]

src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs

@@ -35,8 +35,8 @@ extern crate syntax;
 
 use rustc_data_structures::thin_vec::ThinVec;
 use syntax::ast::*;
-use syntax::codemap::{Spanned, DUMMY_SP, FileName};
-use syntax::codemap::FilePathMapping;
+use syntax::source_map::{Spanned, DUMMY_SP, FileName};
+use syntax::source_map::FilePathMapping;
 use syntax::fold::{self, Folder};
 use syntax::parse::{self, ParseSess};
 use syntax::print::pprust;

src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs

@@ -29,7 +29,7 @@ use rustc::hir::intravisit;
 use rustc::hir::map as hir_map;
 use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
 use rustc::ty;
-use syntax::{ast, codemap};
+use syntax::{ast, source_map};
 
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
@@ -54,7 +54,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingWhitelistedAttrPass {
                 _: intravisit::FnKind<'tcx>,
                 _: &'tcx hir::FnDecl,
                 _: &'tcx hir::Body,
-                span: codemap::Span,
+                span: source_map::Span,
                 id: ast::NodeId) {
 
         let item = match cx.tcx.hir.get(id) {

src/test/run-pass-fulldeps/qquote.rs

@@ -15,7 +15,7 @@
 extern crate syntax;
 extern crate syntax_pos;
 
-use syntax::codemap::FilePathMapping;
+use syntax::source_map::FilePathMapping;
 use syntax::print::pprust::*;
 use syntax::symbol::Symbol;
 use syntax_pos::DUMMY_SP;

src/test/ui/cfg-empty-codemap.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Tests that empty codemaps don't ICE (#23301)
+// Tests that empty source_maps don't ICE (#23301)
 
 // compile-flags: --cfg ""
 

src/test/ui/mod/mod_file_correct_spans.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Testing that the codemap is maintained correctly when parsing mods from external files
+// Testing that the source_map is maintained correctly when parsing mods from external files
 
 mod mod_file_aux;