Skip to content

Commit 458c955

Browse files
qsantosqsantos
committed
Fix conflicts with double_ended_iterator_last
1 parent 707653f commit 458c955

File tree

6 files changed

+34
-24
lines changed

6 files changed

+34
-24
lines changed

‎tests/ui/infinite_iter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(clippy::uninlined_format_args)]
1+
#![allow(clippy::uninlined_format_args, clippy::double_ended_iterator_last)]
22

33
use std::iter::repeat;
44
fn square_is_lower_64(x: &u32) -> bool {

‎tests/ui/iter_overeager_cloned.fixed‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#![warn(clippy::iter_overeager_cloned, clippy::redundant_clone, clippy::filter_next)]
2-
#![allow(dead_code, clippy::let_unit_value, clippy::useless_vec)]
2+
#![allow(
3+
dead_code,
4+
clippy::let_unit_value,
5+
clippy::useless_vec,
6+
clippy::double_ended_iterator_last
7+
)]
38

49
fn main() {
510
let vec = vec!["1".to_string(), "2".to_string(), "3".to_string()];

‎tests/ui/iter_overeager_cloned.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#![warn(clippy::iter_overeager_cloned, clippy::redundant_clone, clippy::filter_next)]
2-
#![allow(dead_code, clippy::let_unit_value, clippy::useless_vec)]
2+
#![allow(
3+
dead_code,
4+
clippy::let_unit_value,
5+
clippy::useless_vec,
6+
clippy::double_ended_iterator_last
7+
)]
38

49
fn main() {
510
let vec = vec!["1".to_string(), "2".to_string(), "3".to_string()];

‎tests/ui/iter_overeager_cloned.stderr‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unnecessarily eager cloning of iterator items
2-
--> tests/ui/iter_overeager_cloned.rs:7:29
2+
--> tests/ui/iter_overeager_cloned.rs:12:29
33
|
44
LL | let _: Option<String> = vec.iter().cloned().last();
55
| ^^^^^^^^^^----------------
@@ -10,15 +10,15 @@ LL | let _: Option<String> = vec.iter().cloned().last();
1010
= help: to override `-D warnings` add `#[allow(clippy::iter_overeager_cloned)]`
1111

1212
error: unnecessarily eager cloning of iterator items
13-
--> tests/ui/iter_overeager_cloned.rs:9:29
13+
--> tests/ui/iter_overeager_cloned.rs:14:29
1414
|
1515
LL | let _: Option<String> = vec.iter().chain(vec.iter()).cloned().next();
1616
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^----------------
1717
| |
1818
| help: try: `.next().cloned()`
1919

2020
error: unneeded cloning of iterator items
21-
--> tests/ui/iter_overeager_cloned.rs:11:20
21+
--> tests/ui/iter_overeager_cloned.rs:16:20
2222
|
2323
LL | let _: usize = vec.iter().filter(|x| x == &"2").cloned().count();
2424
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------
@@ -29,31 +29,31 @@ LL | let _: usize = vec.iter().filter(|x| x == &"2").cloned().count();
2929
= help: to override `-D warnings` add `#[allow(clippy::redundant_clone)]`
3030

3131
error: unnecessarily eager cloning of iterator items
32-
--> tests/ui/iter_overeager_cloned.rs:13:21
32+
--> tests/ui/iter_overeager_cloned.rs:18:21
3333
|
3434
LL | let _: Vec<_> = vec.iter().cloned().take(2).collect();
3535
| ^^^^^^^^^^-----------------
3636
| |
3737
| help: try: `.take(2).cloned()`
3838

3939
error: unnecessarily eager cloning of iterator items
40-
--> tests/ui/iter_overeager_cloned.rs:15:21
40+
--> tests/ui/iter_overeager_cloned.rs:20:21
4141
|
4242
LL | let _: Vec<_> = vec.iter().cloned().skip(2).collect();
4343
| ^^^^^^^^^^-----------------
4444
| |
4545
| help: try: `.skip(2).cloned()`
4646

4747
error: unnecessarily eager cloning of iterator items
48-
--> tests/ui/iter_overeager_cloned.rs:17:13
48+
--> tests/ui/iter_overeager_cloned.rs:22:13
4949
|
5050
LL | let _ = vec.iter().filter(|x| x == &"2").cloned().nth(2);
5151
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^----------------
5252
| |
5353
| help: try: `.nth(2).cloned()`
5454

5555
error: unnecessarily eager cloning of iterator items
56-
--> tests/ui/iter_overeager_cloned.rs:19:13
56+
--> tests/ui/iter_overeager_cloned.rs:24:13
5757
|
5858
LL | let _ = [Some(Some("str".to_string())), Some(Some("str".to_string()))]
5959
| _____________^
@@ -69,95 +69,95 @@ LL ~ .flatten().cloned();
6969
|
7070

7171
error: unnecessarily eager cloning of iterator items
72-
--> tests/ui/iter_overeager_cloned.rs:24:13
72+
--> tests/ui/iter_overeager_cloned.rs:29:13
7373
|
7474
LL | let _ = vec.iter().cloned().filter(|x| x.starts_with('2'));
7575
| ^^^^^^^^^^----------------------------------------
7676
| |
7777
| help: try: `.filter(|&x| x.starts_with('2')).cloned()`
7878

7979
error: unnecessarily eager cloning of iterator items
80-
--> tests/ui/iter_overeager_cloned.rs:26:13
80+
--> tests/ui/iter_overeager_cloned.rs:31:13
8181
|
8282
LL | let _ = vec.iter().cloned().find(|x| x == "2");
8383
| ^^^^^^^^^^----------------------------
8484
| |
8585
| help: try: `.find(|&x| x == "2").cloned()`
8686

8787
error: unnecessarily eager cloning of iterator items
88-
--> tests/ui/iter_overeager_cloned.rs:30:17
88+
--> tests/ui/iter_overeager_cloned.rs:35:17
8989
|
9090
LL | let _ = vec.iter().cloned().filter(f);
9191
| ^^^^^^^^^^-------------------
9292
| |
9393
| help: try: `.filter(|&x| f(x)).cloned()`
9494

9595
error: unnecessarily eager cloning of iterator items
96-
--> tests/ui/iter_overeager_cloned.rs:31:17
96+
--> tests/ui/iter_overeager_cloned.rs:36:17
9797
|
9898
LL | let _ = vec.iter().cloned().find(f);
9999
| ^^^^^^^^^^-----------------
100100
| |
101101
| help: try: `.find(|&x| f(x)).cloned()`
102102

103103
error: unnecessarily eager cloning of iterator items
104-
--> tests/ui/iter_overeager_cloned.rs:37:17
104+
--> tests/ui/iter_overeager_cloned.rs:42:17
105105
|
106106
LL | let _ = vec.iter().cloned().filter(f);
107107
| ^^^^^^^^^^-------------------
108108
| |
109109
| help: try: `.filter(|&x| f(x)).cloned()`
110110

111111
error: unnecessarily eager cloning of iterator items
112-
--> tests/ui/iter_overeager_cloned.rs:38:17
112+
--> tests/ui/iter_overeager_cloned.rs:43:17
113113
|
114114
LL | let _ = vec.iter().cloned().find(f);
115115
| ^^^^^^^^^^-----------------
116116
| |
117117
| help: try: `.find(|&x| f(x)).cloned()`
118118

119119
error: unnecessarily eager cloning of iterator items
120-
--> tests/ui/iter_overeager_cloned.rs:45:9
120+
--> tests/ui/iter_overeager_cloned.rs:50:9
121121
|
122122
LL | iter.cloned().filter(move |(&a, b)| a == 1 && b == &target)
123123
| ^^^^-------------------------------------------------------
124124
| |
125125
| help: try: `.filter(move |&(&a, b)| a == 1 && b == &target).cloned()`
126126

127127
error: unnecessarily eager cloning of iterator items
128-
--> tests/ui/iter_overeager_cloned.rs:56:13
128+
--> tests/ui/iter_overeager_cloned.rs:61:13
129129
|
130130
LL | iter.cloned().filter(move |S { a, b }| **a == 1 && b == &target)
131131
| ^^^^------------------------------------------------------------
132132
| |
133133
| help: try: `.filter(move |&S { a, b }| **a == 1 && b == &target).cloned()`
134134

135135
error: unneeded cloning of iterator items
136-
--> tests/ui/iter_overeager_cloned.rs:60:13
136+
--> tests/ui/iter_overeager_cloned.rs:65:13
137137
|
138138
LL | let _ = vec.iter().cloned().map(|x| x.len());
139139
| ^^^^^^^^^^--------------------------
140140
| |
141141
| help: try: `.map(|x| x.len())`
142142

143143
error: unneeded cloning of iterator items
144-
--> tests/ui/iter_overeager_cloned.rs:65:13
144+
--> tests/ui/iter_overeager_cloned.rs:70:13
145145
|
146146
LL | let _ = vec.iter().cloned().for_each(|x| assert!(!x.is_empty()));
147147
| ^^^^^^^^^^----------------------------------------------
148148
| |
149149
| help: try: `.for_each(|x| assert!(!x.is_empty()))`
150150

151151
error: unneeded cloning of iterator items
152-
--> tests/ui/iter_overeager_cloned.rs:67:13
152+
--> tests/ui/iter_overeager_cloned.rs:72:13
153153
|
154154
LL | let _ = vec.iter().cloned().all(|x| x.len() == 1);
155155
| ^^^^^^^^^^-------------------------------
156156
| |
157157
| help: try: `.all(|x| x.len() == 1)`
158158

159159
error: unneeded cloning of iterator items
160-
--> tests/ui/iter_overeager_cloned.rs:69:13
160+
--> tests/ui/iter_overeager_cloned.rs:74:13
161161
|
162162
LL | let _ = vec.iter().cloned().any(|x| x.len() == 1);
163163
| ^^^^^^^^^^-------------------------------

‎tests/ui/starts_ends_with.fixed‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(clippy::needless_if, dead_code, unused_must_use)]
1+
#![allow(clippy::needless_if, dead_code, unused_must_use, clippy::double_ended_iterator_last)]
22

33
fn main() {}
44

‎tests/ui/starts_ends_with.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(clippy::needless_if, dead_code, unused_must_use)]
1+
#![allow(clippy::needless_if, dead_code, unused_must_use, clippy::double_ended_iterator_last)]
22

33
fn main() {}
44

0 commit comments

Comments
 (0)