Add support for outputting with multiple formats (#893)

Fixes #496

benches/output.rs

@@ -3,54 +3,53 @@
 extern crate test;
 
 use grcov::{
-    output_activedata_etl, output_covdir, output_lcov, CovResult, CovResultIter, Function,
-    FunctionMap,
+    output_activedata_etl, output_covdir, output_lcov, CovResult, Function, FunctionMap,
+    ResultTuple,
 };
 use rustc_hash::FxHashMap;
 use std::path::PathBuf;
 use tempfile::tempdir;
 use test::{black_box, Bencher};
 
-fn generate_cov_result_iter() -> CovResultIter {
-    Box::new(
-        FxHashMap::default()
-            .into_iter()
-            .map(|(_, _): (PathBuf, CovResult)| {
-                (
-                    PathBuf::from(""),
-                    PathBuf::from(""),
-                    CovResult {
-                        branches: [].iter().cloned().collect(),
-                        functions: {
-                            let mut functions: FunctionMap = FxHashMap::default();
-                            functions.insert(
-                                "f1".to_string(),
-                                Function {
-                                    start: 1,
-                                    executed: true,
-                                },
-                            );
-                            functions.insert(
-                                "f2".to_string(),
-                                Function {
-                                    start: 2,
-                                    executed: false,
-                                },
-                            );
-                            functions
-                        },
-                        lines: [(1, 21), (2, 7), (7, 0)].iter().cloned().collect(),
+fn generate_cov_result_iter() -> Vec<ResultTuple> {
+    FxHashMap::default()
+        .into_iter()
+        .map(|(_, _): (PathBuf, CovResult)| {
+            (
+                PathBuf::from(""),
+                PathBuf::from(""),
+                CovResult {
+                    branches: [].iter().cloned().collect(),
+                    functions: {
+                        let mut functions: FunctionMap = FxHashMap::default();
+                        functions.insert(
+                            "f1".to_string(),
+                            Function {
+                                start: 1,
+                                executed: true,
+                            },
+                        );
+                        functions.insert(
+                            "f2".to_string(),
+                            Function {
+                                start: 2,
+                                executed: false,
+                            },
+                        );
+                        functions
                     },
-                )
-            }),
-    )
+                    lines: [(1, 21), (2, 7), (7, 0)].iter().cloned().collect(),
+                },
+            )
+        })
+        .collect::<Vec<_>>()
 }
 #[bench]
 fn bench_output_activedata_etl(b: &mut Bencher) {
     let dir = tempdir().unwrap();
     b.iter(|| {
         black_box(output_activedata_etl(
-            generate_cov_result_iter(),
+            &generate_cov_result_iter(),
             Some(&dir.path().join("temp")),
             false,
         ))
@@ -62,7 +61,7 @@ fn bench_output_covdir(b: &mut Bencher) {
     let dir = tempdir().unwrap();
     b.iter(|| {
         black_box(output_covdir(
-            generate_cov_result_iter(),
+            &generate_cov_result_iter(),
             Some(&dir.path().join("temp")),
         ));
     });
@@ -73,7 +72,7 @@ fn bench_output_lcov(b: &mut Bencher) {
     let dir = tempdir().unwrap();
     b.iter(|| {
         black_box(output_lcov(
-            generate_cov_result_iter(),
+            &generate_cov_result_iter(),
             Some(&dir.path().join("temp")),
             false,
         ));

src/cobertura.rs

@@ -1,3 +1,4 @@
+use crate::defs::*;
 use quick_xml::{
     events::{BytesDecl, BytesEnd, BytesStart, BytesText, Event},
     Writer,
@@ -9,7 +10,6 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use symbolic_common::Name;
 use symbolic_demangle::{Demangle, DemangleOptions};
 
-use crate::defs::CovResultIter;
 use crate::output::get_target_output_writable;
 
 macro_rules! demangle {
@@ -229,12 +229,13 @@ impl ToString for ConditionType {
 }
 
 fn get_coverage(
-    results: CovResultIter,
+    results: &[ResultTuple],
     sources: Vec<String>,
     demangle: bool,
     demangle_options: DemangleOptions,
 ) -> Coverage {
     let packages: Vec<Package> = results
+        .iter()
         .map(|(_, rel_path, result)| {
             let all_lines: Vec<u32> = result.lines.iter().map(|(k, _)| k).cloned().collect();
 
@@ -246,13 +247,9 @@ fn get_coverage(
             }
             start_indexes.sort_unstable();
 
-            let functions = result.functions;
-            let result_lines = result.lines;
-            let result_branches = result.branches;
-
             let line_from_number = |number| {
-                let hits = result_lines.get(&number).cloned().unwrap_or_default();
-                if let Some(branches) = result_branches.get(&number) {
+                let hits = result.lines.get(&number).cloned().unwrap_or_default();
+                if let Some(branches) = result.branches.get(&number) {
                     let conditions = branches
                         .iter()
                         .enumerate()
@@ -272,7 +269,8 @@ fn get_coverage(
                 }
             };
 
-            let methods: Vec<Method> = functions
+            let methods: Vec<Method> = result
+                .functions
                 .iter()
                 .map(|(name, function)| {
                     let mut func_end = end;
@@ -329,7 +327,7 @@ fn get_coverage(
 
 pub fn output_cobertura(
     source_dir: Option<&Path>,
-    results: CovResultIter,
+    results: &[ResultTuple],
     output_file: Option<&Path>,
     demangle: bool,
 ) {
@@ -714,8 +712,7 @@ mod tests {
             coverage_result(Result::Main),
         )];
 
-        let results = Box::new(results.into_iter());
-        output_cobertura(None, results, Some(&file_path), true);
+        output_cobertura(None, &results, Some(&file_path), true);
 
         let results = read_file(&file_path);
 
@@ -749,8 +746,7 @@ mod tests {
             coverage_result(Result::Test),
         )];
 
-        let results = Box::new(results.into_iter());
-        output_cobertura(None, results, Some(file_path.as_ref()), true);
+        output_cobertura(None, &results, Some(file_path.as_ref()), true);
 
         let results = read_file(&file_path);
 
@@ -789,8 +785,7 @@ mod tests {
             ),
         ];
 
-        let results = Box::new(results.into_iter());
-        output_cobertura(None, results, Some(file_path.as_ref()), true);
+        output_cobertura(None, &results, Some(file_path.as_ref()), true);
 
         let results = read_file(&file_path);
 
@@ -822,8 +817,7 @@ mod tests {
             CovResult::default(),
         )];
 
-        let results = Box::new(results.into_iter());
-        output_cobertura(None, results, Some(&file_path), true);
+        output_cobertura(None, &results, Some(&file_path), true);
 
         let results = read_file(&file_path);
 
@@ -843,8 +837,7 @@ mod tests {
             CovResult::default(),
         )];
 
-        let results = Box::new(results.into_iter());
-        output_cobertura(Some(Path::new("src")), results, Some(&file_path), true);
+        output_cobertura(Some(Path::new("src")), &results, Some(&file_path), true);
 
         let results = read_file(&file_path);
 

src/defs.rs

@@ -58,7 +58,7 @@ pub type JobSender = Sender<Option<WorkItem>>;
 
 pub type CovResultMap = FxHashMap<String, CovResult>;
 pub type SyncCovResultMap = Mutex<CovResultMap>;
-pub type CovResultIter = Box<dyn Iterator<Item = (PathBuf, PathBuf, CovResult)>>;
+pub type ResultTuple = (PathBuf, PathBuf, CovResult);
 
 #[derive(Debug, Default)]
 pub struct CDStats {