squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #74965 - JohnTitor:sort-params, r=estebank

Browse source 
Presort restrictions to make output consistent

The const test part is already adjusted so this should fix #74886.
r? @estebank
This commit is contained in:
bors 2020-07-31 10:16:57 +00:00
parent 3a92b9987a 1629fed4c0
commit e614f66800
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/librustc_typeck/check/method/suggest.rs
View file

@ -678,6 +678,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
.collect::<Vec<(usize, String)>>();
for ((span, empty_where), obligations) in type_params.into_iter() {
restrict_type_params = true;
// #74886: Sort here so that the output is always the same.
let mut obligations = obligations.into_iter().collect::<Vec<_>>();
obligations.sort();
err.span_suggestion_verbose(
span,
&format!(
@ -688,7 +691,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
format!(
"{} {}",
if empty_where { " where" } else { "," },
obligations.into_iter().collect::<Vec<_>>().join(", ")
obligations.join(", ")
),
Applicability::MaybeIncorrect,
);