Creating a custom message closure for configuration mismatches

Author: davidalber

tests/system.rs

@@ -103,7 +103,7 @@ fn assert_output(source: &Path, expected_filename: &Path) {
     if !compare.is_empty() {
         let mut failures = HashMap::new();
         failures.insert(source.to_owned(), compare);
-        print_mismatches(failures);
+        print_mismatches_default_message(failures, source.display());
         assert!(false, "Text does not match expected output");
     }
 }
@@ -219,15 +219,15 @@ where
     for file_name in files.filter(|f| f.extension().map_or(false, |f| f == "rs")) {
         debug!("Testing '{}'...", file_name.display());
 
-        match idempotent_check(file_name) {
+        match idempotent_check(&file_name) {
             Ok(ref report) if report.has_warnings() => {
                 print!("{}", report);
                 fails += 1;
             }
             Ok(report) => reports.push(report),
             Err(err) => {
                 if let IdempotentCheckError::Mismatch(msg) = err {
-                    print_mismatches(msg);
+                    print_mismatches_default_message(msg, file_name.display());
                 }
                 fails += 1;
             }
@@ -239,15 +239,22 @@ where
     (reports, count, fails)
 }
 
-fn print_mismatches(result: HashMap<PathBuf, Vec<Mismatch>>) {
-    let mut t = term::stdout().unwrap();
+fn print_mismatches_default_message(
+    result: HashMap<PathBuf, Vec<Mismatch>>,
+    file_name: std::path::Display,
+) {
+    print_mismatches(result, |line_num| {
+        format!("\nMismatch at {}:{}:", file_name, line_num)
+    });
+}
 
-    for (file_name, diff) in result {
-        print_diff(
-            diff,
-            |line_num| format!("\nMismatch at {}:{}:", file_name.display(), line_num),
-            Color::Auto,
-        );
+fn print_mismatches<T: Fn(u32) -> String>(
+    result: HashMap<PathBuf, Vec<Mismatch>>,
+    mismatch_msg_formatter: T,
+) {
+    let mut t = term::stdout().unwrap();
+    for (_file_name, diff) in result {
+        print_diff(diff, &mismatch_msg_formatter, Color::Auto);
     }
 
     t.reset().unwrap();
@@ -287,7 +294,7 @@ pub enum IdempotentCheckError {
     Parse,
 }
 
-pub fn idempotent_check(filename: PathBuf) -> Result<FormatReport, IdempotentCheckError> {
+pub fn idempotent_check(filename: &PathBuf) -> Result<FormatReport, IdempotentCheckError> {
     let sig_comments = read_significant_comments(&filename);
     let config = read_config(&filename);
     let (error_summary, file_map, format_report) = format_file(filename, &config);
@@ -611,7 +618,12 @@ fn check_blocks_idempotency(blocks: &Vec<CodeBlock>) {
                         if !compare.is_empty() {
                             let mut mismatches = HashMap::new();
                             mismatches.insert(PathBuf::from("Configurations.md"), compare);
-                            print_mismatches(mismatches);
+                            print_mismatches(mismatches, |line_num| {
+                                format!(
+                                    "\nMismatch at Configurations.md:{}:",
+                                    line_num + block.code_block_start_line - 1
+                                )
+                            });
                             failures += 1;
                         }
                     }