Print original file from which the error is coming, when there is an …

…error
mozilla · May 10, 2018 · 4179f54 · 4179f54
1 parent eb63798
commit 4179f54
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/defs.rs b/src/defs.rs
@@ -32,6 +32,7 @@ pub enum ItemType {
 pub struct WorkItem {
     pub format: ItemFormat,
     pub item: ItemType,
+    pub name: String,
 }
 
 impl WorkItem {

diff --git a/src/lib.rs b/src/lib.rs
@@ -131,7 +131,7 @@ pub fn consumer(working_dir: &PathBuf, result_map: &SyncCovResultMap, queue: &Wo
                 }
 
                 if gcov_type == GcovType::SingleFile {
-                    let new_results = try_parse!(parse_gcov(&gcov_path), gcov_path.display());
+                    let new_results = try_parse!(parse_gcov(&gcov_path), work_item.name);
                     fs::remove_file(gcov_path).unwrap();
                     new_results
                 } else {
@@ -141,7 +141,7 @@ pub fn consumer(working_dir: &PathBuf, result_map: &SyncCovResultMap, queue: &Wo
                         let gcov_path = entry.unwrap();
                         let gcov_path = gcov_path.path();
 
-                        new_results.append(&mut try_parse!(parse_gcov(&gcov_path), gcov_path.display()));
+                        new_results.append(&mut try_parse!(parse_gcov(&gcov_path), work_item.name));
 
                         fs::remove_file(gcov_path).unwrap();
                     }
@@ -154,11 +154,11 @@ pub fn consumer(working_dir: &PathBuf, result_map: &SyncCovResultMap, queue: &Wo
                     ItemType::Path(info_path) => {
                         let f = File::open(&info_path).expect("Failed to open lcov file");
                         let file = BufReader::new(&f);
-                        try_parse!(parse_lcov(file, branch_enabled), info_path.display())
+                        try_parse!(parse_lcov(file, branch_enabled), work_item.name)
                     },
                     ItemType::Content(info_content) => {
                         let buffer = BufReader::new(Cursor::new(info_content));
-                        try_parse!(parse_lcov(buffer, branch_enabled), "")
+                        try_parse!(parse_lcov(buffer, branch_enabled), work_item.name)
                     }
                 }
             }

diff --git a/src/producer.rs b/src/producer.rs
@@ -50,6 +50,7 @@ fn dir_producer(directories: &[&String], queue: &WorkQueue, ignore_orphan_gcno:
                 queue.push(Some(WorkItem {
                     format: format,
                     item: ItemType::Path(abs_path),
+                    name: path.to_str().unwrap().to_string(),
                 }));
             }
         }
@@ -70,8 +71,8 @@ fn extract_file(zip_file: &mut zip::read::ZipFile, path: &PathBuf) {
 
 fn zip_producer(tmp_dir: &Path, zip_files: &[&String], queue: &WorkQueue, ignore_orphan_gcno: bool) -> Option<Vec<u8>> {
     let mut gcno_archive: Option<ZipArchive<File>> = None;
-    let mut gcda_archives: Vec<ZipArchive<File>> = Vec::new();
-    let mut info_archives: Vec<ZipArchive<File>> = Vec::new();
+    let mut gcda_archives: Vec<(&String,ZipArchive<File>)> = Vec::new();
+    let mut info_archives: Vec<(&String,ZipArchive<File>)> = Vec::new();
 
     let mut path_mapping_file = None;
 
@@ -80,9 +81,9 @@ fn zip_producer(tmp_dir: &Path, zip_files: &[&String], queue: &WorkQueue, ignore
         if zip_file.contains("gcno") {
             gcno_archive = Some(archive);
         } else if zip_file.contains("gcda") {
-            gcda_archives.push(archive);
+            gcda_archives.push((zip_file, archive));
         } else if zip_file.contains("info") || zip_file.contains("grcov") || zip_file.contains("jsvm") {
-            info_archives.push(archive);
+            info_archives.push((zip_file, archive));
         } else {
             panic!("Unsupported archive type.");
         }
@@ -122,7 +123,7 @@ fn zip_producer(tmp_dir: &Path, zip_files: &[&String], queue: &WorkQueue, ignore
 
                 let gcda_path_in_zip = gcno_path_in_zip.with_extension("gcda");
 
-                for (num, gcda_archive) in gcda_archives.iter_mut().enumerate() {
+                for (num, &mut (gcda_archive_name, ref mut gcda_archive)) in gcda_archives.iter_mut().enumerate() {
                     let gcno_path = path.with_file_name(format!("{}_{}.gcno", stem, num + 1));
 
                     if let Ok(mut gcda_file) = gcda_archive.by_name(&gcda_path_in_zip.to_str().unwrap().replace("\\", "/")) {
@@ -138,19 +139,21 @@ fn zip_producer(tmp_dir: &Path, zip_files: &[&String], queue: &WorkQueue, ignore
                         queue.push(Some(WorkItem {
                             format: ItemFormat::GCNO,
                             item: ItemType::Path(gcno_path),
+                            name: gcda_archive_name.to_string(),
                         }));
                     } else if num == 0 && !ignore_orphan_gcno {
                         queue.push(Some(WorkItem {
                             format: ItemFormat::GCNO,
                             item: ItemType::Path(gcno_path),
+                            name: gcda_archive_name.to_string(),
                         }));
                     }
                 }
             }
         }
     }
 
-    for archive in &mut info_archives {
+    for &mut (archive_name, ref mut archive) in &mut info_archives {
         for i in 0..archive.len() {
             let mut file = archive.by_index(i).unwrap();
 
@@ -163,6 +166,7 @@ fn zip_producer(tmp_dir: &Path, zip_files: &[&String], queue: &WorkQueue, ignore
             queue.push(Some(WorkItem {
                 format: ItemFormat::INFO,
                 item: ItemType::Content(buffer),
+                name: archive_name.to_string(),
             }));
         }
     }