Skip to content

Commit d7bb746

Browse files
committed
Make clippy tests happy
1 parent 88abd7d commit d7bb746

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

src/tools/clippy/tests/ui/bytes_nth.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
fn main() {
77
let s = String::from("String");
88
s.as_bytes().get(3);
9-
&s.as_bytes().get(3);
9+
let _ = &s.as_bytes().get(3);
1010
s[..].as_bytes().get(3);
1111
}

src/tools/clippy/tests/ui/bytes_nth.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
fn main() {
77
let s = String::from("String");
88
s.bytes().nth(3);
9-
&s.bytes().nth(3);
9+
let _ = &s.bytes().nth(3);
1010
s[..].bytes().nth(3);
1111
}

src/tools/clippy/tests/ui/bytes_nth.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ LL | s.bytes().nth(3);
77
= note: `-D clippy::bytes-nth` implied by `-D warnings`
88

99
error: called `.byte().nth()` on a `String`
10-
--> $DIR/bytes_nth.rs:9:6
10+
--> $DIR/bytes_nth.rs:9:14
1111
|
12-
LL | &s.bytes().nth(3);
13-
| ^^^^^^^^^^^^^^^^ help: try: `s.as_bytes().get(3)`
12+
LL | let _ = &s.bytes().nth(3);
13+
| ^^^^^^^^^^^^^^^^ help: try: `s.as_bytes().get(3)`
1414

1515
error: called `.byte().nth()` on a `str`
1616
--> $DIR/bytes_nth.rs:10:5

src/tools/clippy/tests/ui/iter_count.fixed

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#![warn(clippy::iter_count)]
55
#![allow(
6-
unused_variables,
7-
array_into_iter,
8-
unused_mut,
9-
clippy::into_iter_on_ref,
10-
clippy::unnecessary_operation
6+
unused_variables,
7+
array_into_iter,
8+
unused_mut,
9+
clippy::into_iter_on_ref,
10+
clippy::unnecessary_operation
1111
)]
1212

1313
extern crate option_helpers;
@@ -50,7 +50,7 @@ fn main() {
5050
linked_list.push_back(1);
5151
binary_heap.push(1);
5252

53-
&vec[..].len();
53+
let _ = &vec[..].len();
5454
vec.len();
5555
boxed_slice.len();
5656
vec_deque.len();
@@ -62,13 +62,13 @@ fn main() {
6262
binary_heap.len();
6363

6464
vec.len();
65-
&vec[..].len();
65+
let _ = &vec[..].len();
6666
vec_deque.len();
6767
hash_map.len();
6868
b_tree_map.len();
6969
linked_list.len();
7070

71-
&vec[..].len();
71+
let _ = &vec[..].len();
7272
vec.len();
7373
vec_deque.len();
7474
hash_set.len();

src/tools/clippy/tests/ui/iter_count.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#![warn(clippy::iter_count)]
55
#![allow(
6-
unused_variables,
7-
array_into_iter,
8-
unused_mut,
9-
clippy::into_iter_on_ref,
10-
clippy::unnecessary_operation
6+
unused_variables,
7+
array_into_iter,
8+
unused_mut,
9+
clippy::into_iter_on_ref,
10+
clippy::unnecessary_operation
1111
)]
1212

1313
extern crate option_helpers;
@@ -50,7 +50,7 @@ fn main() {
5050
linked_list.push_back(1);
5151
binary_heap.push(1);
5252

53-
&vec[..].iter().count();
53+
let _ = &vec[..].iter().count();
5454
vec.iter().count();
5555
boxed_slice.iter().count();
5656
vec_deque.iter().count();
@@ -62,13 +62,13 @@ fn main() {
6262
binary_heap.iter().count();
6363

6464
vec.iter_mut().count();
65-
&vec[..].iter_mut().count();
65+
let _ = &vec[..].iter_mut().count();
6666
vec_deque.iter_mut().count();
6767
hash_map.iter_mut().count();
6868
b_tree_map.iter_mut().count();
6969
linked_list.iter_mut().count();
7070

71-
&vec[..].into_iter().count();
71+
let _ = &vec[..].into_iter().count();
7272
vec.into_iter().count();
7373
vec_deque.into_iter().count();
7474
hash_set.into_iter().count();

src/tools/clippy/tests/ui/iter_count.stderr

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

@@ -67,10 +67,10 @@ 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:6
70+
--> $DIR/iter_count.rs:65:14
7171
|
72-
LL | &vec[..].iter_mut().count();
73-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
72+
LL | let _ = &vec[..].iter_mut().count();
73+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
7474

7575
error: called `.iter_mut().count()` on a `VecDeque`
7676
--> $DIR/iter_count.rs:66:5
@@ -97,10 +97,10 @@ 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:6
100+
--> $DIR/iter_count.rs:71:14
101101
|
102-
LL | &vec[..].into_iter().count();
103-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
102+
LL | let _ = &vec[..].into_iter().count();
103+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `vec[..].len()`
104104

105105
error: called `.into_iter().count()` on a `Vec`
106106
--> $DIR/iter_count.rs:72:5

0 commit comments

Comments
 (0)