Skip to content

Commit af08da6

Browse files
committed
Auto merge of #13424 - weihanglo:fix-13016, r=epage
fix(test-support): remove special case for `$message_type`
2 parents 99176ca + c426fbe commit af08da6

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

crates/cargo-test-support/src/compare.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -596,18 +596,6 @@ fn find_json_mismatch_r<'a>(
596596
let mut expected_entries = l.iter();
597597
let mut actual_entries = r.iter();
598598

599-
// Compilers older than 1.76 do not produce $message_type.
600-
// Treat it as optional for now.
601-
let mut expected_entries_without_message_type;
602-
let expected_entries: &mut dyn Iterator<Item = _> =
603-
if l.contains_key("$message_type") && !r.contains_key("$message_type") {
604-
expected_entries_without_message_type =
605-
expected_entries.filter(|entry| entry.0 != "$message_type");
606-
&mut expected_entries_without_message_type
607-
} else {
608-
&mut expected_entries
609-
};
610-
611599
loop {
612600
match (expected_entries.next(), actual_entries.next()) {
613601
(None, None) => return None,

0 commit comments

Comments
 (0)