Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-07 01:05:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

unnecessary_sort_by: reduce suggestion diffs (#16417)

Browse Source 
Now, only `call_span` is replaced, so the receiver is not a part of the
diff. This also removes the need to create a snippet for the receiver.

changelog: [`unnecessary_sort_by`]: reduce suggestion diffs
This commit is contained in:
Jason Newcomb
2026-01-19 19:05:59 +00:00
committed by GitHub
parent fe4bc3123f 196c098d24
commit bbfe34e205
4 changed files with 178 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clippy_lints/src/methods/mod.rs
+2 -2
View File
@@ -5532,10 +5532,10 @@ fn check_methods<'tcx>(&self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
stable_sort_primitive::check(cx, expr, recv);
},
(sym::sort_by, [arg]) => {
unnecessary_sort_by::check(cx, expr, recv, arg, false);
unnecessary_sort_by::check(cx, expr, call_span, arg, false);
},
(sym::sort_unstable_by, [arg]) => {
unnecessary_sort_by::check(cx, expr, recv, arg, true);
unnecessary_sort_by::check(cx, expr, call_span, arg, true);
},
(sym::split, [arg]) => {
str_split::check(cx, expr, recv, arg);
clippy_lints/src/methods/unnecessary_sort_by.rs
+10 -8
View File
@@ -343,7 +343,7 @@ fn expr_is_field_access(expr: &Expr<'_>) -> bool {
pub(super) fn check<'tcx>(
cx: &LateContext<'tcx>,
expr: &'tcx Expr<'_>,
recv: &'tcx Expr<'_>,
call_span: Span,
arg: &'tcx Expr<'_>,
is_unstable: bool,
) {
@@ -367,17 +367,16 @@ pub(super) fn check<'tcx>(
format!("consider using `{method}`"),
|diag| {
let mut app = trigger.applicability;
let recv = Sugg::hir_with_applicability(cx, recv, "(_)", &mut app);
let closure_body = if trigger.reverse {
format!("{std_or_core}::cmp::Reverse({})", trigger.closure_body)
} else {
trigger.closure_body
};
let closure_arg = snippet_with_applicability(cx, trigger.closure_arg, "_", &mut app);
diag.span_suggestion(
expr.span,
diag.span_suggestion_verbose(
call_span,
"try",
format!("{recv}.{method}(|{closure_arg}| {closure_body})"),
format!("{method}(|{closure_arg}| {closure_body})"),
app,
);
},
@@ -391,9 +390,12 @@ pub(super) fn check<'tcx>(
expr.span,
format!("consider using `{method}`"),
|diag| {
let mut app = Applicability::MachineApplicable;
let recv = Sugg::hir_with_applicability(cx, recv, "(_)", &mut app);
diag.span_suggestion(expr.span, "try", format!("{recv}.{method}()"), app);
diag.span_suggestion_verbose(
call_span,
"try",
format!("{method}()"),
Applicability::MachineApplicable,
);
},
);
},
tests/ui/unnecessary_sort_by.stderr
+153 -22
View File
@@ -2,136 +2,267 @@ error: consider using `sort`
--> tests/ui/unnecessary_sort_by.rs:12:5
|
LL | vec.sort_by(|a, b| a.cmp(b));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort()`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::unnecessary-sort-by` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::unnecessary_sort_by)]`
help: try
|
LL - vec.sort_by(|a, b| a.cmp(b));
LL + vec.sort();
|
error: consider using `sort_unstable`
--> tests/ui/unnecessary_sort_by.rs:14:5
|
LL | vec.sort_unstable_by(|a, b| a.cmp(b));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable()`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_unstable_by(|a, b| a.cmp(b));
LL + vec.sort_unstable();
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:16:5
|
LL | vec.sort_by(|a, b| (a + 5).abs().cmp(&(b + 5).abs()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|a| (a + 5).abs())`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_by(|a, b| (a + 5).abs().cmp(&(b + 5).abs()));
LL + vec.sort_by_key(|a| (a + 5).abs());
|
error: consider using `sort_unstable_by_key`
--> tests/ui/unnecessary_sort_by.rs:18:5
|
LL | vec.sort_unstable_by(|a, b| id(-a).cmp(&id(-b)));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|a| id(-a))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_unstable_by(|a, b| id(-a).cmp(&id(-b)));
LL + vec.sort_unstable_by_key(|a| id(-a));
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:22:5
|
LL | vec.sort_by(|a, b| (b + 5).abs().cmp(&(a + 5).abs()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|b| std::cmp::Reverse((b + 5).abs()))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_by(|a, b| (b + 5).abs().cmp(&(a + 5).abs()));
LL + vec.sort_by_key(|b| std::cmp::Reverse((b + 5).abs()));
|
error: consider using `sort_unstable_by_key`
--> tests/ui/unnecessary_sort_by.rs:24:5
|
LL | vec.sort_unstable_by(|a, b| id(-b).cmp(&id(-a)));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|b| std::cmp::Reverse(id(-b)))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_unstable_by(|a, b| id(-b).cmp(&id(-a)));
LL + vec.sort_unstable_by_key(|b| std::cmp::Reverse(id(-b)));
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:35:5
|
LL | vec.sort_by(|a, b| (***a).abs().cmp(&(***b).abs()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|a| (***a).abs())`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_by(|a, b| (***a).abs().cmp(&(***b).abs()));
LL + vec.sort_by_key(|a| (***a).abs());
|
error: consider using `sort_unstable_by_key`
--> tests/ui/unnecessary_sort_by.rs:37:5
|
LL | vec.sort_unstable_by(|a, b| (***a).abs().cmp(&(***b).abs()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|a| (***a).abs())`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_unstable_by(|a, b| (***a).abs().cmp(&(***b).abs()));
LL + vec.sort_unstable_by_key(|a| (***a).abs());
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:97:9
|
LL | args.sort_by(|a, b| a.name().cmp(&b.name()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_by_key(|a| a.name())`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - args.sort_by(|a, b| a.name().cmp(&b.name()));
LL + args.sort_by_key(|a| a.name());
|
error: consider using `sort_unstable_by_key`
--> tests/ui/unnecessary_sort_by.rs:99:9
|
LL | args.sort_unstable_by(|a, b| a.name().cmp(&b.name()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_unstable_by_key(|a| a.name())`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - args.sort_unstable_by(|a, b| a.name().cmp(&b.name()));
LL + args.sort_unstable_by_key(|a| a.name());
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:102:9
|
LL | args.sort_by(|a, b| b.name().cmp(&a.name()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_by_key(|b| std::cmp::Reverse(b.name()))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - args.sort_by(|a, b| b.name().cmp(&a.name()));
LL + args.sort_by_key(|b| std::cmp::Reverse(b.name()));
|
error: consider using `sort_unstable_by_key`
--> tests/ui/unnecessary_sort_by.rs:104:9
|
LL | args.sort_unstable_by(|a, b| b.name().cmp(&a.name()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_unstable_by_key(|b| std::cmp::Reverse(b.name()))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - args.sort_unstable_by(|a, b| b.name().cmp(&a.name()));
LL + args.sort_unstable_by_key(|b| std::cmp::Reverse(b.name()));
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:118:5
|
LL | v.sort_by(|a, b| a.0.cmp(&b.0));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|a| a.0)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|a, b| a.0.cmp(&b.0));
LL + v.sort_by_key(|a| a.0);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:136:5
|
LL | items.sort_by(|item1, item2| item1.key.cmp(&item2.key));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `items.sort_by_key(|item1| item1.key)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - items.sort_by(|item1, item2| item1.key.cmp(&item2.key));
LL + items.sort_by_key(|item1| item1.key);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:141:5
|
LL | items.sort_by(|item1, item2| item1.value.clone().cmp(&item2.value.clone()));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `items.sort_by_key(|item1| item1.value.clone())`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - items.sort_by(|item1, item2| item1.value.clone().cmp(&item2.value.clone()));
LL + items.sort_by_key(|item1| item1.value.clone());
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:147:5
|
LL | v.sort_by(|(_, s1), (_, s2)| s1.cmp(s2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|(_, s1)| *s1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|(_, s1), (_, s2)| s1.cmp(s2));
LL + v.sort_by_key(|(_, s1)| *s1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:154:5
|
LL | v.sort_by(|Foo { bar: b1 }, Foo { bar: b2 }| b1.cmp(b2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|Foo { bar: b1 }| *b1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|Foo { bar: b1 }, Foo { bar: b2 }| b1.cmp(b2));
LL + v.sort_by_key(|Foo { bar: b1 }| *b1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:159:5
|
LL | v.sort_by(|Baz(b1), Baz(b2)| b1.cmp(b2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|Baz(b1)| *b1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|Baz(b1), Baz(b2)| b1.cmp(b2));
LL + v.sort_by_key(|Baz(b1)| *b1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:162:5
|
LL | v.sort_by(|&Baz(b1), &Baz(b2)| b1.cmp(&b2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|&Baz(b1)| b1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|&Baz(b1), &Baz(b2)| b1.cmp(&b2));
LL + v.sort_by_key(|&Baz(b1)| b1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:166:5
|
LL | v.sort_by(|&&b1, &&b2| b1.cmp(&b2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|&&b1| b1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|&&b1, &&b2| b1.cmp(&b2));
LL + v.sort_by_key(|&&b1| b1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:170:5
|
LL | v.sort_by(|[a1, b1], [a2, b2]| a1.cmp(a2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|[a1, b1]| *a1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|[a1, b1], [a2, b2]| a1.cmp(a2));
LL + v.sort_by_key(|[a1, b1]| *a1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by.rs:173:5
|
LL | v.sort_by(|[a1, b1], [a2, b2]| (a1 - b1).cmp(&(a2 - b2)));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `v.sort_by_key(|[a1, b1]| a1 - b1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - v.sort_by(|[a1, b1], [a2, b2]| (a1 - b1).cmp(&(a2 - b2)));
LL + v.sort_by_key(|[a1, b1]| a1 - b1);
|
error: aborting due to 22 previous errors
tests/ui/unnecessary_sort_by_no_std.stderr
+13 -2
View File
@@ -2,16 +2,27 @@ error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by_no_std.rs:10:5
|
LL | vec.sort_by(|a, b| (a + 1).cmp(&(b + 1)));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|a| a + 1)`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::unnecessary-sort-by` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::unnecessary_sort_by)]`
help: try
|
LL - vec.sort_by(|a, b| (a + 1).cmp(&(b + 1)));
LL + vec.sort_by_key(|a| a + 1);
|
error: consider using `sort_by_key`
--> tests/ui/unnecessary_sort_by_no_std.rs:19:5
|
LL | vec.sort_by(|a, b| (b + 1).cmp(&(a + 1)));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|b| core::cmp::Reverse(b + 1))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL - vec.sort_by(|a, b| (b + 1).cmp(&(a + 1)));
LL + vec.sort_by_key(|b| core::cmp::Reverse(b + 1));
|
error: aborting due to 2 previous errors