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

Rollup merge of #109215 - est31:sort_by_key, r=Nilstrieb

Browse Source 
Use sort_by_key instead of sort_by

I went over the cases where sort_by is used and in these two, one can use sort_by_key instead.
This commit is contained in:
Matthias Krüger 2023-03-17 08:42:40 +01:00 committed by GitHub
commit a530f72268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_borrowck/src/region_infer/mod.rs
View File

@ -255,7 +255,7 @@ fn sccs_info<'cx, 'tcx>(
let var_to_origin = infcx.reg_var_to_origin.borrow(); let var_to_origin = infcx.reg_var_to_origin.borrow();
let mut var_to_origin_sorted = var_to_origin.clone().into_iter().collect::<Vec<_>>(); let mut var_to_origin_sorted = var_to_origin.clone().into_iter().collect::<Vec<_>>();
var_to_origin_sorted.sort_by(|a, b| a.0.cmp(&b.0)); var_to_origin_sorted.sort_by_key(|vto| vto.0);
let mut debug_str = "region variables to origins:\n".to_string(); let mut debug_str = "region variables to origins:\n".to_string();
for (reg_var, origin) in var_to_origin_sorted.into_iter() { for (reg_var, origin) in var_to_origin_sorted.into_iter() {
debug_str.push_str(&format!("{:?}: {:?}\n", reg_var, origin)); debug_str.push_str(&format!("{:?}: {:?}\n", reg_var, origin));
@ -2216,7 +2216,7 @@ pub(crate) fn best_blame_constraint(
// is in the same SCC or something. In that case, find what // is in the same SCC or something. In that case, find what
// appears to be the most interesting point to report to the // appears to be the most interesting point to report to the
// user via an even more ad-hoc guess. // user via an even more ad-hoc guess.
categorized_path.sort_by(|p0, p1| p0.category.cmp(&p1.category)); categorized_path.sort_by_key(|p| p.category);
debug!("sorted_path={:#?}", categorized_path); debug!("sorted_path={:#?}", categorized_path);
(categorized_path.remove(0), extra_info) (categorized_path.remove(0), extra_info)