From 062bfbf39bef9360e1553f293f4f1015c5680dec Mon Sep 17 00:00:00 2001 From: Donato Sciarra Date: Sat, 18 Aug 2018 12:14:14 +0200 Subject: mv codemap source_map --- src/test/incremental/span_hash_stable/main.rs | 2 +- src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs | 2 +- src/test/ui/cfg-empty-codemap.rs | 2 +- src/test/ui/mod/mod_file_correct_spans.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/test') diff --git a/src/test/incremental/span_hash_stable/main.rs b/src/test/incremental/span_hash_stable/main.rs index 1512c5dc537..646a388c877 100644 --- a/src/test/incremental/span_hash_stable/main.rs +++ b/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. diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs index 5214d7db5cc..7edb3e0f8a0 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs @@ -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) { diff --git a/src/test/ui/cfg-empty-codemap.rs b/src/test/ui/cfg-empty-codemap.rs index 8868a5a9549..f06d22d985f 100644 --- a/src/test/ui/cfg-empty-codemap.rs +++ b/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 "" diff --git a/src/test/ui/mod/mod_file_correct_spans.rs b/src/test/ui/mod/mod_file_correct_spans.rs index 52837479869..1efd9ba8e55 100644 --- a/src/test/ui/mod/mod_file_correct_spans.rs +++ b/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; -- cgit 1.4.1-3-g733a5