Skip to content

Commit d46766a

Browse files
committed
Provide more context in assertion
1 parent 28935a5 commit d46766a

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

gix-blame/src/file/function.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,16 @@ pub fn file(
197197
if let Some(range_in_suspect) = hunk.get_range(&suspect) {
198198
let range_in_blamed_file = hunk.range_in_blamed_file.clone();
199199

200-
for (blamed_line_number, source_line_number) in range_in_blamed_file.zip(range_in_suspect.clone()) {
201-
let source_token = source_lines_as_tokens[source_line_number as usize];
202-
let blame_token = blamed_lines_as_tokens[blamed_line_number as usize];
203-
204-
let source_line = BString::new(source_interner[source_token].into());
205-
let blamed_line = BString::new(blamed_interner[blame_token].into());
206-
207-
assert_eq!(source_line, blamed_line);
208-
}
200+
let source_lines = range_in_suspect
201+
.clone()
202+
.map(|i| BString::new(source_interner[source_lines_as_tokens[i as usize]].into()))
203+
.collect::<Vec<_>>();
204+
let blamed_lines = range_in_blamed_file
205+
.clone()
206+
.map(|i| BString::new(blamed_interner[blamed_lines_as_tokens[i as usize]].into()))
207+
.collect::<Vec<_>>();
208+
209+
assert_eq!(source_lines, blamed_lines);
209210
}
210211
}
211212
}

0 commit comments

Comments
 (0)