Skip to content

Commit 727f7b0

Browse files
committed
Fix error message printing wrong file names
The error messsages from `self_test` does not display correct file names (it just prints `src/lib.rs` for every file). This commit fixes it.
1 parent cb0b366 commit 727f7b0

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

tests/system.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ fn assert_output(source: &Path, expected_filename: &Path) {
166166
if !compare.is_empty() {
167167
let mut failures = HashMap::new();
168168
failures.insert(source.to_owned(), compare);
169-
print_mismatches_default_message(failures, source.display());
169+
print_mismatches_default_message(failures);
170170
assert!(false, "Text does not match expected output");
171171
}
172172
}
@@ -281,7 +281,7 @@ fn check_files(files: Vec<PathBuf>) -> (Vec<FormatReport>, u32, u32) {
281281
Ok(report) => reports.push(report),
282282
Err(err) => {
283283
if let IdempotentCheckError::Mismatch(msg) = err {
284-
print_mismatches_default_message(msg, file_name.display());
284+
print_mismatches_default_message(msg);
285285
}
286286
fails += 1;
287287
}
@@ -293,13 +293,15 @@ fn check_files(files: Vec<PathBuf>) -> (Vec<FormatReport>, u32, u32) {
293293
(reports, count, fails)
294294
}
295295

296-
fn print_mismatches_default_message(
297-
result: HashMap<PathBuf, Vec<Mismatch>>,
298-
file_name: std::path::Display,
299-
) {
300-
print_mismatches(result, |line_num| {
301-
format!("\nMismatch at {}:{}:", file_name, line_num)
302-
});
296+
fn print_mismatches_default_message(result: HashMap<PathBuf, Vec<Mismatch>>) {
297+
let mut t = term::stdout().unwrap();
298+
for (file_name, diff) in result {
299+
let mismatch_msg_formatter =
300+
|line_num| format!("\nMismatch at {}:{}:", file_name.display(), line_num);
301+
print_diff(diff, &mismatch_msg_formatter, Color::Auto);
302+
}
303+
304+
t.reset().unwrap();
303305
}
304306

305307
fn print_mismatches<T: Fn(u32) -> String>(

0 commit comments

Comments
 (0)