Skip to content

Commit d1ca1c1

Browse files
borsbors
committed
Auto merge of #8462 - ken-matsui:use-precise-namespace-for-reverse, r=llogiq
Use the precise namespace for `Reverse` Closes: #8461 changelog: [`unnecessary_sort_by`](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_sort_by): Use the precise namespace for `Reverse`
2 parents e329249 + 7412e69 commit d1ca1c1

File tree

4 files changed

+21
-25
lines changed

4 files changed

+21
-25
lines changed

‎clippy_lints/src/unnecessary_sort_by.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ impl LateLintPass<'_> for UnnecessarySortBy {
239239
if trigger.unstable { "_unstable" } else { "" },
240240
trigger.closure_arg,
241241
if trigger.reverse {
242-
format!("Reverse({})", trigger.closure_body)
242+
format!("std::cmp::Reverse({})", trigger.closure_body)
243243
} else {
244244
trigger.closure_body.to_string()
245245
},

‎tests/ui/unnecessary_sort_by.fixed

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(clippy::stable_sort_primitive)]
44

55
use std::cell::Ref;
6-
use std::cmp::Reverse;
76

87
fn unnecessary_sort_by() {
98
fn id(x: isize) -> isize {
@@ -18,8 +17,8 @@ fn unnecessary_sort_by() {
1817
vec.sort_unstable_by_key(|a| id(-a));
1918
// Reverse examples
2019
vec.sort_by(|a, b| b.cmp(a)); // not linted to avoid suggesting `Reverse(b)` which would borrow
21-
vec.sort_by_key(|b| Reverse((b + 5).abs()));
22-
vec.sort_unstable_by_key(|b| Reverse(id(-b)));
20+
vec.sort_by_key(|b| std::cmp::Reverse((b + 5).abs()));
21+
vec.sort_unstable_by_key(|b| std::cmp::Reverse(id(-b)));
2322
// Negative examples (shouldn't be changed)
2423
let c = &7;
2524
vec.sort_by(|a, b| (b - a).cmp(&(a - b)));
@@ -76,7 +75,6 @@ mod issue_5754 {
7675

7776
// The closure parameter is not dereferenced anymore, so non-Copy types can be linted
7877
mod issue_6001 {
79-
use super::*;
8078
struct Test(String);
8179

8280
impl Test {
@@ -93,8 +91,8 @@ mod issue_6001 {
9391
args.sort_by_key(|a| a.name());
9492
args.sort_unstable_by_key(|a| a.name());
9593
// Reverse
96-
args.sort_by_key(|b| Reverse(b.name()));
97-
args.sort_unstable_by_key(|b| Reverse(b.name()));
94+
args.sort_by_key(|b| std::cmp::Reverse(b.name()));
95+
args.sort_unstable_by_key(|b| std::cmp::Reverse(b.name()));
9896
}
9997
}
10098

‎tests/ui/unnecessary_sort_by.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(clippy::stable_sort_primitive)]
44

55
use std::cell::Ref;
6-
use std::cmp::Reverse;
76

87
fn unnecessary_sort_by() {
98
fn id(x: isize) -> isize {
@@ -76,7 +75,6 @@ mod issue_5754 {
7675

7776
// The closure parameter is not dereferenced anymore, so non-Copy types can be linted
7877
mod issue_6001 {
79-
use super::*;
8078
struct Test(String);
8179

8280
impl Test {

‎tests/ui/unnecessary_sort_by.stderr

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
error: use Vec::sort here instead
2-
--> $DIR/unnecessary_sort_by.rs:15:5
2+
--> $DIR/unnecessary_sort_by.rs:14:5
33
|
44
LL | vec.sort_by(|a, b| a.cmp(b));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort()`
66
|
77
= note: `-D clippy::unnecessary-sort-by` implied by `-D warnings`
88

99
error: use Vec::sort here instead
10-
--> $DIR/unnecessary_sort_by.rs:16:5
10+
--> $DIR/unnecessary_sort_by.rs:15:5
1111
|
1212
LL | vec.sort_unstable_by(|a, b| a.cmp(b));
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable()`
1414

1515
error: use Vec::sort_by_key here instead
16-
--> $DIR/unnecessary_sort_by.rs:17:5
16+
--> $DIR/unnecessary_sort_by.rs:16:5
1717
|
1818
LL | vec.sort_by(|a, b| (a + 5).abs().cmp(&(b + 5).abs()));
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|a| (a + 5).abs())`
2020

2121
error: use Vec::sort_by_key here instead
22-
--> $DIR/unnecessary_sort_by.rs:18:5
22+
--> $DIR/unnecessary_sort_by.rs:17:5
2323
|
2424
LL | vec.sort_unstable_by(|a, b| id(-a).cmp(&id(-b)));
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|a| id(-a))`
2626

2727
error: use Vec::sort_by_key here instead
28-
--> $DIR/unnecessary_sort_by.rs:21:5
28+
--> $DIR/unnecessary_sort_by.rs:20:5
2929
|
3030
LL | vec.sort_by(|a, b| (b + 5).abs().cmp(&(a + 5).abs()));
31-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|b| Reverse((b + 5).abs()))`
31+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|b| std::cmp::Reverse((b + 5).abs()))`
3232

3333
error: use Vec::sort_by_key here instead
34-
--> $DIR/unnecessary_sort_by.rs:22:5
34+
--> $DIR/unnecessary_sort_by.rs:21:5
3535
|
3636
LL | vec.sort_unstable_by(|a, b| id(-b).cmp(&id(-a)));
37-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|b| Reverse(id(-b)))`
37+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|b| std::cmp::Reverse(id(-b)))`
3838

3939
error: use Vec::sort_by_key here instead
40-
--> $DIR/unnecessary_sort_by.rs:32:5
40+
--> $DIR/unnecessary_sort_by.rs:31:5
4141
|
4242
LL | vec.sort_by(|a, b| (***a).abs().cmp(&(***b).abs()));
4343
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_by_key(|a| (***a).abs())`
4444

4545
error: use Vec::sort_by_key here instead
46-
--> $DIR/unnecessary_sort_by.rs:33:5
46+
--> $DIR/unnecessary_sort_by.rs:32:5
4747
|
4848
LL | vec.sort_unstable_by(|a, b| (***a).abs().cmp(&(***b).abs()));
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.sort_unstable_by_key(|a| (***a).abs())`
5050

5151
error: use Vec::sort_by_key here instead
52-
--> $DIR/unnecessary_sort_by.rs:93:9
52+
--> $DIR/unnecessary_sort_by.rs:91:9
5353
|
5454
LL | args.sort_by(|a, b| a.name().cmp(&b.name()));
5555
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_by_key(|a| a.name())`
5656

5757
error: use Vec::sort_by_key here instead
58-
--> $DIR/unnecessary_sort_by.rs:94:9
58+
--> $DIR/unnecessary_sort_by.rs:92:9
5959
|
6060
LL | args.sort_unstable_by(|a, b| a.name().cmp(&b.name()));
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_unstable_by_key(|a| a.name())`
6262

6363
error: use Vec::sort_by_key here instead
64-
--> $DIR/unnecessary_sort_by.rs:96:9
64+
--> $DIR/unnecessary_sort_by.rs:94:9
6565
|
6666
LL | args.sort_by(|a, b| b.name().cmp(&a.name()));
67-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_by_key(|b| Reverse(b.name()))`
67+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_by_key(|b| std::cmp::Reverse(b.name()))`
6868

6969
error: use Vec::sort_by_key here instead
70-
--> $DIR/unnecessary_sort_by.rs:97:9
70+
--> $DIR/unnecessary_sort_by.rs:95:9
7171
|
7272
LL | args.sort_unstable_by(|a, b| b.name().cmp(&a.name()));
73-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_unstable_by_key(|b| Reverse(b.name()))`
73+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `args.sort_unstable_by_key(|b| std::cmp::Reverse(b.name()))`
7474

7575
error: aborting due to 12 previous errors
7676

0 commit comments

Comments
 (0)