Skip to content

Commit e181011

Browse files
borsbors
committed
Auto merge of #7929 - flip1995:rustup, r=flip1995
Rustup r? `@ghost` changelog: none
2 parents 150a659 + c7f5462 commit e181011

File tree

9 files changed

+57
-61
lines changed

9 files changed

+57
-61
lines changed

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ path = "src/driver.rs"
2222

2323
[dependencies]
2424
clippy_lints = { version = "0.1", path = "clippy_lints" }
25-
semver = "0.11"
25+
semver = "1.0"
2626
rustc_tools_util = { version = "0.2", path = "rustc_tools_util" }
2727
tempfile = { version = "3.2", optional = true }
2828

2929
[dev-dependencies]
30-
cargo_metadata = "0.12"
30+
cargo_metadata = "0.14"
3131
compiletest_rs = { version = "0.7.1", features = ["tmp"] }
3232
tester = "0.9"
3333
regex = "1.5"

‎clippy_lints/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ keywords = ["clippy", "lint", "plugin"]
99
edition = "2021"
1010

1111
[dependencies]
12-
cargo_metadata = "0.12"
12+
cargo_metadata = "0.14"
1313
clippy_utils = { path = "../clippy_utils" }
1414
if_chain = "1.0"
1515
itertools = "0.10"
@@ -21,7 +21,7 @@ serde_json = { version = "1.0", optional = true }
2121
toml = "0.5"
2222
unicode-normalization = "0.1"
2323
unicode-script = { version = "0.5", default-features = false }
24-
semver = "0.11"
24+
semver = "1.0"
2525
rustc-semver = "1.1"
2626
# NOTE: cargo requires serde feat in its url dep
2727
# see <https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864>

‎clippy_lints/src/vec.rs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,7 @@ impl<'tcx> LateLintPass<'tcx> for UselessVec {
6363
if is_copy(cx, vec_type(cx.typeck_results().expr_ty_adjusted(arg)));
6464
then {
6565
// report the error around the `vec!` not inside `<std macros>:`
66-
let span = arg.span
67-
.ctxt()
68-
.outer_expn_data()
69-
.call_site
70-
.ctxt()
71-
.outer_expn_data()
72-
.call_site;
66+
let span = arg.span.ctxt().outer_expn_data().call_site;
7367
self.check_vec_macro(cx, &vec_args, Mutability::Not, span);
7468
}
7569
}

‎rust-toolchain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2021-10-21"
2+
channel = "nightly-2021-11-04"
33
components = ["llvm-tools-preview", "rustc-dev", "rust-src"]

‎tests/ui/crashes/ice-6252.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ LL | _n: PhantomData,
66
|
77
help: consider importing one of these items
88
|
9+
LL | use core::marker::PhantomData;
10+
|
911
LL | use serde::__private::PhantomData;
1012
|
1113
LL | use std::marker::PhantomData;
1214
|
13-
LL | use core::marker::PhantomData;
14-
|
1515

1616
error[E0412]: cannot find type `VAL` in this scope
1717
--> $DIR/ice-6252.rs:10:63

‎tests/ui/iter_count.fixed‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ impl HasIter {
3333
}
3434
}
3535

36+
#[allow(unused_must_use)]
3637
fn main() {
3738
let mut vec = vec![0, 1, 2, 3];
3839
let mut boxed_slice: Box<[u8]> = Box::new([0, 1, 2, 3]);
@@ -50,7 +51,7 @@ fn main() {
5051
linked_list.push_back(1);
5152
binary_heap.push(1);
5253

53-
let _ = &vec[..].len();
54+
&vec[..].len();
5455
vec.len();
5556
boxed_slice.len();
5657
vec_deque.len();
@@ -62,13 +63,13 @@ fn main() {
6263
binary_heap.len();
6364

6465
vec.len();
65-
let _ = &vec[..].len();
66+
&vec[..].len();
6667
vec_deque.len();
6768
hash_map.len();
6869
b_tree_map.len();
6970
linked_list.len();
7071

71-
let _ = &vec[..].len();
72+
&vec[..].len();
7273
vec.len();
7374
vec_deque.len();
7475
hash_set.len();

‎tests/ui/iter_count.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ impl HasIter {
3333
}
3434
}
3535

36+
#[allow(unused_must_use)]
3637
fn main() {
3738
let mut vec = vec![0, 1, 2, 3];
3839
let mut boxed_slice: Box<[u8]> = Box::new([0, 1, 2, 3]);
@@ -50,7 +51,7 @@ fn main() {
5051
linked_list.push_back(1);
5152
binary_heap.push(1);
5253

53-
let _ = &vec[..].iter().count();
54+
&vec[..].iter().count();
5455
vec.iter().count();
5556
boxed_slice.iter().count();
5657
vec_deque.iter().count();
@@ -62,13 +63,13 @@ fn main() {
6263
binary_heap.iter().count();
6364

6465
vec.iter_mut().count();
65-
let _ = &vec[..].iter_mut().count();
66+
&vec[..].iter_mut().count();
6667
vec_deque.iter_mut().count();
6768
hash_map.iter_mut().count();
6869
b_tree_map.iter_mut().count();
6970
linked_list.iter_mut().count();
7071

71-
let _ = &vec[..].into_iter().count();
72+
&vec[..].into_iter().count();
7273
vec.into_iter().count();
7374
vec_deque.into_iter().count();
7475
hash_set.into_iter().count();

‎tests/ui/iter_count.stderr‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,151 @@
11
error: called `.iter().count()` on a `slice`
2-
--> $DIR/iter_count.rs:53:14
2+
--> $DIR/iter_count.rs:54:6
33
|
4-
LL | let _ = &vec[..].iter().count();
5-
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
4+
LL | &vec[..].iter().count();
5+
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
66
|
77
= note: `-D clippy::iter-count` implied by `-D warnings`
88

99
error: called `.iter().count()` on a `Vec`
10-
--> $DIR/iter_count.rs:54:5
10+
--> $DIR/iter_count.rs:55:5
1111
|
1212
LL | vec.iter().count();
1313
| ^^^^^^^^^^^^^^^^^^ help: try: `vec.len()`
1414

1515
error: called `.iter().count()` on a `slice`
16-
--> $DIR/iter_count.rs:55:5
16+
--> $DIR/iter_count.rs:56:5
1717
|
1818
LL | boxed_slice.iter().count();
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `boxed_slice.len()`
2020

2121
error: called `.iter().count()` on a `VecDeque`
22-
--> $DIR/iter_count.rs:56:5
22+
--> $DIR/iter_count.rs:57:5
2323
|
2424
LL | vec_deque.iter().count();
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec_deque.len()`
2626

2727
error: called `.iter().count()` on a `HashSet`
28-
--> $DIR/iter_count.rs:57:5
28+
--> $DIR/iter_count.rs:58:5
2929
|
3030
LL | hash_set.iter().count();
3131
| ^^^^^^^^^^^^^^^^^^^^^^^ help: try: `hash_set.len()`
3232

3333
error: called `.iter().count()` on a `HashMap`
34-
--> $DIR/iter_count.rs:58:5
34+
--> $DIR/iter_count.rs:59:5
3535
|
3636
LL | hash_map.iter().count();
3737
| ^^^^^^^^^^^^^^^^^^^^^^^ help: try: `hash_map.len()`
3838

3939
error: called `.iter().count()` on a `BTreeMap`
40-
--> $DIR/iter_count.rs:59:5
40+
--> $DIR/iter_count.rs:60:5
4141
|
4242
LL | b_tree_map.iter().count();
4343
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `b_tree_map.len()`
4444

4545
error: called `.iter().count()` on a `BTreeSet`
46-
--> $DIR/iter_count.rs:60:5
46+
--> $DIR/iter_count.rs:61:5
4747
|
4848
LL | b_tree_set.iter().count();
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `b_tree_set.len()`
5050

5151
error: called `.iter().count()` on a `LinkedList`
52-
--> $DIR/iter_count.rs:61:5
52+
--> $DIR/iter_count.rs:62:5
5353
|
5454
LL | linked_list.iter().count();
5555
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `linked_list.len()`
5656

5757
error: called `.iter().count()` on a `BinaryHeap`
58-
--> $DIR/iter_count.rs:62:5
58+
--> $DIR/iter_count.rs:63:5
5959
|
6060
LL | binary_heap.iter().count();
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `binary_heap.len()`
6262

6363
error: called `.iter_mut().count()` on a `Vec`
64-
--> $DIR/iter_count.rs:64:5
64+
--> $DIR/iter_count.rs:65:5
6565
|
6666
LL | vec.iter_mut().count();
6767
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.len()`
6868

6969
error: called `.iter_mut().count()` on a `slice`
70-
--> $DIR/iter_count.rs:65:14
70+
--> $DIR/iter_count.rs:66:6
7171
|
72-
LL | let _ = &vec[..].iter_mut().count();
73-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
72+
LL | &vec[..].iter_mut().count();
73+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
7474

7575
error: called `.iter_mut().count()` on a `VecDeque`
76-
--> $DIR/iter_count.rs:66:5
76+
--> $DIR/iter_count.rs:67:5
7777
|
7878
LL | vec_deque.iter_mut().count();
7979
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec_deque.len()`
8080

8181
error: called `.iter_mut().count()` on a `HashMap`
82-
--> $DIR/iter_count.rs:67:5
82+
--> $DIR/iter_count.rs:68:5
8383
|
8484
LL | hash_map.iter_mut().count();
8585
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `hash_map.len()`
8686

8787
error: called `.iter_mut().count()` on a `BTreeMap`
88-
--> $DIR/iter_count.rs:68:5
88+
--> $DIR/iter_count.rs:69:5
8989
|
9090
LL | b_tree_map.iter_mut().count();
9191
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `b_tree_map.len()`
9292

9393
error: called `.iter_mut().count()` on a `LinkedList`
94-
--> $DIR/iter_count.rs:69:5
94+
--> $DIR/iter_count.rs:70:5
9595
|
9696
LL | linked_list.iter_mut().count();
9797
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `linked_list.len()`
9898

9999
error: called `.into_iter().count()` on a `slice`
100-
--> $DIR/iter_count.rs:71:14
100+
--> $DIR/iter_count.rs:72:6
101101
|
102-
LL | let _ = &vec[..].into_iter().count();
103-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
102+
LL | &vec[..].into_iter().count();
103+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
104104

105105
error: called `.into_iter().count()` on a `Vec`
106-
--> $DIR/iter_count.rs:72:5
106+
--> $DIR/iter_count.rs:73:5
107107
|
108108
LL | vec.into_iter().count();
109109
| ^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec.len()`
110110

111111
error: called `.into_iter().count()` on a `VecDeque`
112-
--> $DIR/iter_count.rs:73:5
112+
--> $DIR/iter_count.rs:74:5
113113
|
114114
LL | vec_deque.into_iter().count();
115115
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec_deque.len()`
116116

117117
error: called `.into_iter().count()` on a `HashSet`
118-
--> $DIR/iter_count.rs:74:5
118+
--> $DIR/iter_count.rs:75:5
119119
|
120120
LL | hash_set.into_iter().count();
121121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `hash_set.len()`
122122

123123
error: called `.into_iter().count()` on a `HashMap`
124-
--> $DIR/iter_count.rs:75:5
124+
--> $DIR/iter_count.rs:76:5
125125
|
126126
LL | hash_map.into_iter().count();
127127
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `hash_map.len()`
128128

129129
error: called `.into_iter().count()` on a `BTreeMap`
130-
--> $DIR/iter_count.rs:76:5
130+
--> $DIR/iter_count.rs:77:5
131131
|
132132
LL | b_tree_map.into_iter().count();
133133
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `b_tree_map.len()`
134134

135135
error: called `.into_iter().count()` on a `BTreeSet`
136-
--> $DIR/iter_count.rs:77:5
136+
--> $DIR/iter_count.rs:78:5
137137
|
138138
LL | b_tree_set.into_iter().count();
139139
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `b_tree_set.len()`
140140

141141
error: called `.into_iter().count()` on a `LinkedList`
142-
--> $DIR/iter_count.rs:78:5
142+
--> $DIR/iter_count.rs:79:5
143143
|
144144
LL | linked_list.into_iter().count();
145145
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `linked_list.len()`
146146

147147
error: called `.into_iter().count()` on a `BinaryHeap`
148-
--> $DIR/iter_count.rs:79:5
148+
--> $DIR/iter_count.rs:80:5
149149
|
150150
LL | binary_heap.into_iter().count();
151151
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `binary_heap.len()`

‎tests/ui/nonminimal_bool.stderr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ LL | let _ = a == b && c == 5 && a == b;
5050
|
5151
help: try
5252
|
53-
LL | let _ = a == b && c == 5;
54-
| ~~~~~~~~~~~~~~~~
5553
LL | let _ = !(a != b || c != 5);
5654
| ~~~~~~~~~~~~~~~~~~~
55+
LL | let _ = a == b && c == 5;
56+
| ~~~~~~~~~~~~~~~~
5757

5858
error: this boolean expression can be simplified
5959
--> $DIR/nonminimal_bool.rs:28:13
@@ -63,10 +63,10 @@ LL | let _ = a == b || c == 5 || a == b;
6363
|
6464
help: try
6565
|
66-
LL | let _ = a == b || c == 5;
67-
| ~~~~~~~~~~~~~~~~
6866
LL | let _ = !(a != b && c != 5);
6967
| ~~~~~~~~~~~~~~~~~~~
68+
LL | let _ = a == b || c == 5;
69+
| ~~~~~~~~~~~~~~~~
7070

7171
error: this boolean expression can be simplified
7272
--> $DIR/nonminimal_bool.rs:29:13
@@ -76,10 +76,10 @@ LL | let _ = a == b && c == 5 && b == a;
7676
|
7777
help: try
7878
|
79-
LL | let _ = a == b && c == 5;
80-
| ~~~~~~~~~~~~~~~~
8179
LL | let _ = !(a != b || c != 5);
8280
| ~~~~~~~~~~~~~~~~~~~
81+
LL | let _ = a == b && c == 5;
82+
| ~~~~~~~~~~~~~~~~
8383

8484
error: this boolean expression can be simplified
8585
--> $DIR/nonminimal_bool.rs:30:13
@@ -89,10 +89,10 @@ LL | let _ = a != b || !(a != b || c == d);
8989
|
9090
help: try
9191
|
92-
LL | let _ = a != b || c != d;
93-
| ~~~~~~~~~~~~~~~~
9492
LL | let _ = !(a == b && c == d);
9593
| ~~~~~~~~~~~~~~~~~~~
94+
LL | let _ = a != b || c != d;
95+
| ~~~~~~~~~~~~~~~~
9696

9797
error: this boolean expression can be simplified
9898
--> $DIR/nonminimal_bool.rs:31:13
@@ -102,10 +102,10 @@ LL | let _ = a != b && !(a != b && c == d);
102102
|
103103
help: try
104104
|
105-
LL | let _ = a != b && c != d;
106-
| ~~~~~~~~~~~~~~~~
107105
LL | let _ = !(a == b || c == d);
108106
| ~~~~~~~~~~~~~~~~~~~
107+
LL | let _ = a != b && c != d;
108+
| ~~~~~~~~~~~~~~~~
109109

110110
error: aborting due to 12 previous errors
111111

0 commit comments

Comments
 (0)