Rename CodeMap/FileMap to SourceMap/SourceFile

#2946

1 files changed, 10 insertions, 10 deletions

diff --git a/src/test/mod.rs b/src/test/mod.rs
index beba2628112..35a720e4c56 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -20,8 +20,8 @@ use std::path::{Path, PathBuf};
 use std::str::Chars;
 
 use config::{Color, Config, EmitMode, FileName, ReportTactic};
-use filemap;
-use formatting::{FileMap, ModifiedChunk};
+use source_file;
+use formatting::{SourceFile, ModifiedChunk};
 use rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, OutputWriter};
 use {FormatReport, Input, Session};
 
@@ -197,11 +197,11 @@ fn modified_test() {
 // to a known output file generated by one of the write modes.
 fn assert_output(source: &Path, expected_filename: &Path) {
     let config = read_config(source);
-    let (_, file_map, _) = format_file(source, config.clone());
+    let (_, source_file, _) = format_file(source, config.clone());
 
     // Populate output by writing to a vec.
     let mut out = vec![];
-    let _ = filemap::write_all_files(&file_map, &mut out, &config);
+    let _ = source_file::write_all_files(&source_file, &mut out, &config);
     let output = String::from_utf8(out).unwrap();
 
     let mut expected_file = fs::File::open(&expected_filename).expect("Couldn't open target");
@@ -414,15 +414,15 @@ fn read_config(filename: &Path) -> Config {
     config
 }
 
-fn format_file<P: Into<PathBuf>>(filepath: P, config: Config) -> (bool, FileMap, FormatReport) {
+fn format_file<P: Into<PathBuf>>(filepath: P, config: Config) -> (bool, SourceFile, FormatReport) {
     let filepath = filepath.into();
     let input = Input::File(filepath);
     let mut session = Session::<io::Stdout>::new(config, None);
     let result = session.format(input).unwrap();
     let parsing_errors = session.has_parsing_errors();
-    let mut filemap = FileMap::new();
-    mem::swap(&mut session.filemap, &mut filemap);
-    (parsing_errors, filemap, result)
+    let mut source_file = SourceFile::new();
+    mem::swap(&mut session.source_file, &mut source_file);
+    (parsing_errors, source_file, result)
 }
 
 enum IdempotentCheckError {
@@ -440,13 +440,13 @@ fn idempotent_check(
     } else {
         read_config(filename)
     };
-    let (parsing_errors, file_map, format_report) = format_file(filename, config);
+    let (parsing_errors, source_file, format_report) = format_file(filename, config);
     if parsing_errors {
         return Err(IdempotentCheckError::Parse);
     }
 
     let mut write_result = HashMap::new();
-    for (filename, text) in file_map {
+    for (filename, text) in source_file {
         if let FileName::Real(ref filename) = filename {
             write_result.insert(filename.to_owned(), text);
         }