mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #109017 - klensy:dupe, r=cjgillot

Browse Source 
remove duplicated calls to sort_string

`with_forced_trimmed_paths!` was removed in 62ba3e70a1, and this lines became dups.
This commit is contained in:
Matthias Krüger 2023-03-12 08:13:28 +01:00 committed by GitHub
commit c9a38c3c69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_middle/src/ty/error.rs
View File

@ -151,12 +151,8 @@ fn report_maybe_different(expected: &str, found: &str) -> String {
.into(), .into(),
RegionsPlaceholderMismatch => "one type is more general than the other".into(), RegionsPlaceholderMismatch => "one type is more general than the other".into(),
ArgumentSorts(values, _) | Sorts(values) => { ArgumentSorts(values, _) | Sorts(values) => {
let mut expected = values.expected.sort_string(tcx); let expected = values.expected.sort_string(tcx);
let mut found = values.found.sort_string(tcx); let found = values.found.sort_string(tcx);
if expected == found {
expected = values.expected.sort_string(tcx);
found = values.found.sort_string(tcx);
}
report_maybe_different(&expected, &found).into() report_maybe_different(&expected, &found).into()
} }
Traits(values) => { Traits(values) => {