Skip to content

Commit 528308b

Browse files
joshtriplettjoshtriplett
committed
Extend unnecessary_lazy_eval to cover bool::then -> bool::then_some 
1 parent 8c341d6 commit 528308b

File tree

5 files changed

+52
-36
lines changed

5 files changed

+52
-36
lines changed

‎clippy_lints/src/methods/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,6 +2737,7 @@ impl Methods {
27372737
}
27382738
},
27392739
("take", []) => needless_option_take::check(cx, expr, recv),
2740+
("then", [arg]) => unnecessary_lazy_eval::check(cx, expr, recv, arg, "then_some"),
27402741
("to_os_string" | "to_owned" | "to_path_buf" | "to_vec", []) => {
27412742
implicit_clone::check(cx, name, expr, recv);
27422743
},

‎clippy_lints/src/methods/unnecessary_lazy_eval.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ pub(super) fn check<'tcx>(
2020
) {
2121
let is_option = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Option);
2222
let is_result = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
23+
let is_bool = cx.typeck_results().expr_ty(recv).is_bool();
2324

24-
if is_option || is_result {
25+
if is_option || is_result || is_bool {
2526
if let hir::ExprKind::Closure { body, .. } = arg.kind {
2627
let body = cx.tcx.hir().body(body);
2728
let body_expr = &body.value;
@@ -33,8 +34,10 @@ pub(super) fn check<'tcx>(
3334
if eager_or_lazy::switch_to_eager_eval(cx, body_expr) {
3435
let msg = if is_option {
3536
"unnecessary closure used to substitute value for `Option::None`"
36-
} else {
37+
} else if is_result {
3738
"unnecessary closure used to substitute value for `Result::Err`"
39+
} else {
40+
"unnecessary closure used with `bool::then`"
3841
};
3942
let applicability = if body
4043
.params

‎tests/ui/unnecessary_lazy_eval.fixed‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fn main() {
3030
let ext_opt = Some(42);
3131
let nested_opt = Some(Some(42));
3232
let nested_tuple_opt = Some(Some((42, 43)));
33+
let cond = true;
3334

3435
// Should lint - Option
3536
let _ = opt.unwrap_or(2);
@@ -42,6 +43,7 @@ fn main() {
4243
let _ = opt.get_or_insert(2);
4344
let _ = opt.ok_or(2);
4445
let _ = nested_tuple_opt.unwrap_or(Some((1, 2)));
46+
let _ = cond.then_some(astronomers_pi);
4547

4648
// Cases when unwrap is not called on a simple variable
4749
let _ = Some(10).unwrap_or(2);

‎tests/ui/unnecessary_lazy_eval.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fn main() {
3030
let ext_opt = Some(42);
3131
let nested_opt = Some(Some(42));
3232
let nested_tuple_opt = Some(Some((42, 43)));
33+
let cond = true;
3334

3435
// Should lint - Option
3536
let _ = opt.unwrap_or_else(|| 2);
@@ -42,6 +43,7 @@ fn main() {
4243
let _ = opt.get_or_insert_with(|| 2);
4344
let _ = opt.ok_or_else(|| 2);
4445
let _ = nested_tuple_opt.unwrap_or_else(|| Some((1, 2)));
46+
let _ = cond.then(|| astronomers_pi);
4547

4648
// Cases when unwrap is not called on a simple variable
4749
let _ = Some(10).unwrap_or_else(|| 2);

‎tests/ui/unnecessary_lazy_eval.stderr‎

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unnecessary closure used to substitute value for `Option::None`
2-
--> $DIR/unnecessary_lazy_eval.rs:35:13
2+
--> $DIR/unnecessary_lazy_eval.rs:36:13
33
|
44
LL | let _ = opt.unwrap_or_else(|| 2);
55
| ^^^^--------------------
@@ -9,255 +9,263 @@ LL | let _ = opt.unwrap_or_else(|| 2);
99
= note: `-D clippy::unnecessary-lazy-evaluations` implied by `-D warnings`
1010

1111
error: unnecessary closure used to substitute value for `Option::None`
12-
--> $DIR/unnecessary_lazy_eval.rs:36:13
12+
--> $DIR/unnecessary_lazy_eval.rs:37:13
1313
|
1414
LL | let _ = opt.unwrap_or_else(|| astronomers_pi);
1515
| ^^^^---------------------------------
1616
| |
1717
| help: use `unwrap_or(..)` instead: `unwrap_or(astronomers_pi)`
1818

1919
error: unnecessary closure used to substitute value for `Option::None`
20-
--> $DIR/unnecessary_lazy_eval.rs:37:13
20+
--> $DIR/unnecessary_lazy_eval.rs:38:13
2121
|
2222
LL | let _ = opt.unwrap_or_else(|| ext_str.some_field);
2323
| ^^^^-------------------------------------
2424
| |
2525
| help: use `unwrap_or(..)` instead: `unwrap_or(ext_str.some_field)`
2626

2727
error: unnecessary closure used to substitute value for `Option::None`
28-
--> $DIR/unnecessary_lazy_eval.rs:39:13
28+
--> $DIR/unnecessary_lazy_eval.rs:40:13
2929
|
3030
LL | let _ = opt.and_then(|_| ext_opt);
3131
| ^^^^---------------------
3232
| |
3333
| help: use `and(..)` instead: `and(ext_opt)`
3434

3535
error: unnecessary closure used to substitute value for `Option::None`
36-
--> $DIR/unnecessary_lazy_eval.rs:40:13
36+
--> $DIR/unnecessary_lazy_eval.rs:41:13
3737
|
3838
LL | let _ = opt.or_else(|| ext_opt);
3939
| ^^^^-------------------
4040
| |
4141
| help: use `or(..)` instead: `or(ext_opt)`
4242

4343
error: unnecessary closure used to substitute value for `Option::None`
44-
--> $DIR/unnecessary_lazy_eval.rs:41:13
44+
--> $DIR/unnecessary_lazy_eval.rs:42:13
4545
|
4646
LL | let _ = opt.or_else(|| None);
4747
| ^^^^----------------
4848
| |
4949
| help: use `or(..)` instead: `or(None)`
5050

5151
error: unnecessary closure used to substitute value for `Option::None`
52-
--> $DIR/unnecessary_lazy_eval.rs:42:13
52+
--> $DIR/unnecessary_lazy_eval.rs:43:13
5353
|
5454
LL | let _ = opt.get_or_insert_with(|| 2);
5555
| ^^^^------------------------
5656
| |
5757
| help: use `get_or_insert(..)` instead: `get_or_insert(2)`
5858

5959
error: unnecessary closure used to substitute value for `Option::None`
60-
--> $DIR/unnecessary_lazy_eval.rs:43:13
60+
--> $DIR/unnecessary_lazy_eval.rs:44:13
6161
|
6262
LL | let _ = opt.ok_or_else(|| 2);
6363
| ^^^^----------------
6464
| |
6565
| help: use `ok_or(..)` instead: `ok_or(2)`
6666

6767
error: unnecessary closure used to substitute value for `Option::None`
68-
--> $DIR/unnecessary_lazy_eval.rs:44:13
68+
--> $DIR/unnecessary_lazy_eval.rs:45:13
6969
|
7070
LL | let _ = nested_tuple_opt.unwrap_or_else(|| Some((1, 2)));
7171
| ^^^^^^^^^^^^^^^^^-------------------------------
7272
| |
7373
| help: use `unwrap_or(..)` instead: `unwrap_or(Some((1, 2)))`
7474

75+
error: unnecessary closure used with `bool::then`
76+
--> $DIR/unnecessary_lazy_eval.rs:46:13
77+
|
78+
LL | let _ = cond.then(|| astronomers_pi);
79+
| ^^^^^-----------------------
80+
| |
81+
| help: use `then_some(..)` instead: `then_some(astronomers_pi)`
82+
7583
error: unnecessary closure used to substitute value for `Option::None`
76-
--> $DIR/unnecessary_lazy_eval.rs:47:13
84+
--> $DIR/unnecessary_lazy_eval.rs:49:13
7785
|
7886
LL | let _ = Some(10).unwrap_or_else(|| 2);
7987
| ^^^^^^^^^--------------------
8088
| |
8189
| help: use `unwrap_or(..)` instead: `unwrap_or(2)`
8290

8391
error: unnecessary closure used to substitute value for `Option::None`
84-
--> $DIR/unnecessary_lazy_eval.rs:48:13
92+
--> $DIR/unnecessary_lazy_eval.rs:50:13
8593
|
8694
LL | let _ = Some(10).and_then(|_| ext_opt);
8795
| ^^^^^^^^^---------------------
8896
| |
8997
| help: use `and(..)` instead: `and(ext_opt)`
9098

9199
error: unnecessary closure used to substitute value for `Option::None`
92-
--> $DIR/unnecessary_lazy_eval.rs:49:28
100+
--> $DIR/unnecessary_lazy_eval.rs:51:28
93101
|
94102
LL | let _: Option<usize> = None.or_else(|| ext_opt);
95103
| ^^^^^-------------------
96104
| |
97105
| help: use `or(..)` instead: `or(ext_opt)`
98106

99107
error: unnecessary closure used to substitute value for `Option::None`
100-
--> $DIR/unnecessary_lazy_eval.rs:50:13
108+
--> $DIR/unnecessary_lazy_eval.rs:52:13
101109
|
102110
LL | let _ = None.get_or_insert_with(|| 2);
103111
| ^^^^^------------------------
104112
| |
105113
| help: use `get_or_insert(..)` instead: `get_or_insert(2)`
106114

107115
error: unnecessary closure used to substitute value for `Option::None`
108-
--> $DIR/unnecessary_lazy_eval.rs:51:35
116+
--> $DIR/unnecessary_lazy_eval.rs:53:35
109117
|
110118
LL | let _: Result<usize, usize> = None.ok_or_else(|| 2);
111119
| ^^^^^----------------
112120
| |
113121
| help: use `ok_or(..)` instead: `ok_or(2)`
114122

115123
error: unnecessary closure used to substitute value for `Option::None`
116-
--> $DIR/unnecessary_lazy_eval.rs:52:28
124+
--> $DIR/unnecessary_lazy_eval.rs:54:28
117125
|
118126
LL | let _: Option<usize> = None.or_else(|| None);
119127
| ^^^^^----------------
120128
| |
121129
| help: use `or(..)` instead: `or(None)`
122130

123131
error: unnecessary closure used to substitute value for `Option::None`
124-
--> $DIR/unnecessary_lazy_eval.rs:55:13
132+
--> $DIR/unnecessary_lazy_eval.rs:57:13
125133
|
126134
LL | let _ = deep.0.unwrap_or_else(|| 2);
127135
| ^^^^^^^--------------------
128136
| |
129137
| help: use `unwrap_or(..)` instead: `unwrap_or(2)`
130138

131139
error: unnecessary closure used to substitute value for `Option::None`
132-
--> $DIR/unnecessary_lazy_eval.rs:56:13
140+
--> $DIR/unnecessary_lazy_eval.rs:58:13
133141
|
134142
LL | let _ = deep.0.and_then(|_| ext_opt);
135143
| ^^^^^^^---------------------
136144
| |
137145
| help: use `and(..)` instead: `and(ext_opt)`
138146

139147
error: unnecessary closure used to substitute value for `Option::None`
140-
--> $DIR/unnecessary_lazy_eval.rs:57:13
148+
--> $DIR/unnecessary_lazy_eval.rs:59:13
141149
|
142150
LL | let _ = deep.0.or_else(|| None);
143151
| ^^^^^^^----------------
144152
| |
145153
| help: use `or(..)` instead: `or(None)`
146154

147155
error: unnecessary closure used to substitute value for `Option::None`
148-
--> $DIR/unnecessary_lazy_eval.rs:58:13
156+
--> $DIR/unnecessary_lazy_eval.rs:60:13
149157
|
150158
LL | let _ = deep.0.get_or_insert_with(|| 2);
151159
| ^^^^^^^------------------------
152160
| |
153161
| help: use `get_or_insert(..)` instead: `get_or_insert(2)`
154162

155163
error: unnecessary closure used to substitute value for `Option::None`
156-
--> $DIR/unnecessary_lazy_eval.rs:59:13
164+
--> $DIR/unnecessary_lazy_eval.rs:61:13
157165
|
158166
LL | let _ = deep.0.ok_or_else(|| 2);
159167
| ^^^^^^^----------------
160168
| |
161169
| help: use `ok_or(..)` instead: `ok_or(2)`
162170

163171
error: unnecessary closure used to substitute value for `Option::None`
164-
--> $DIR/unnecessary_lazy_eval.rs:79:28
172+
--> $DIR/unnecessary_lazy_eval.rs:81:28
165173
|
166174
LL | let _: Option<usize> = None.or_else(|| Some(3));
167175
| ^^^^^-------------------
168176
| |
169177
| help: use `or(..)` instead: `or(Some(3))`
170178

171179
error: unnecessary closure used to substitute value for `Option::None`
172-
--> $DIR/unnecessary_lazy_eval.rs:80:13
180+
--> $DIR/unnecessary_lazy_eval.rs:82:13
173181
|
174182
LL | let _ = deep.0.or_else(|| Some(3));
175183
| ^^^^^^^-------------------
176184
| |
177185
| help: use `or(..)` instead: `or(Some(3))`
178186

179187
error: unnecessary closure used to substitute value for `Option::None`
180-
--> $DIR/unnecessary_lazy_eval.rs:81:13
188+
--> $DIR/unnecessary_lazy_eval.rs:83:13
181189
|
182190
LL | let _ = opt.or_else(|| Some(3));
183191
| ^^^^-------------------
184192
| |
185193
| help: use `or(..)` instead: `or(Some(3))`
186194

187195
error: unnecessary closure used to substitute value for `Result::Err`
188-
--> $DIR/unnecessary_lazy_eval.rs:87:13
196+
--> $DIR/unnecessary_lazy_eval.rs:89:13
189197
|
190198
LL | let _ = res2.unwrap_or_else(|_| 2);
191199
| ^^^^^---------------------
192200
| |
193201
| help: use `unwrap_or(..)` instead: `unwrap_or(2)`
194202

195203
error: unnecessary closure used to substitute value for `Result::Err`
196-
--> $DIR/unnecessary_lazy_eval.rs:88:13
204+
--> $DIR/unnecessary_lazy_eval.rs:90:13
197205
|
198206
LL | let _ = res2.unwrap_or_else(|_| astronomers_pi);
199207
| ^^^^^----------------------------------
200208
| |
201209
| help: use `unwrap_or(..)` instead: `unwrap_or(astronomers_pi)`
202210

203211
error: unnecessary closure used to substitute value for `Result::Err`
204-
--> $DIR/unnecessary_lazy_eval.rs:89:13
212+
--> $DIR/unnecessary_lazy_eval.rs:91:13
205213
|
206214
LL | let _ = res2.unwrap_or_else(|_| ext_str.some_field);
207215
| ^^^^^--------------------------------------
208216
| |
209217
| help: use `unwrap_or(..)` instead: `unwrap_or(ext_str.some_field)`
210218

211219
error: unnecessary closure used to substitute value for `Result::Err`
212-
--> $DIR/unnecessary_lazy_eval.rs:111:35
220+
--> $DIR/unnecessary_lazy_eval.rs:113:35
213221
|
214222
LL | let _: Result<usize, usize> = res.and_then(|_| Err(2));
215223
| ^^^^--------------------
216224
| |
217225
| help: use `and(..)` instead: `and(Err(2))`
218226

219227
error: unnecessary closure used to substitute value for `Result::Err`
220-
--> $DIR/unnecessary_lazy_eval.rs:112:35
228+
--> $DIR/unnecessary_lazy_eval.rs:114:35
221229
|
222230
LL | let _: Result<usize, usize> = res.and_then(|_| Err(astronomers_pi));
223231
| ^^^^---------------------------------
224232
| |
225233
| help: use `and(..)` instead: `and(Err(astronomers_pi))`
226234

227235
error: unnecessary closure used to substitute value for `Result::Err`
228-
--> $DIR/unnecessary_lazy_eval.rs:113:35
236+
--> $DIR/unnecessary_lazy_eval.rs:115:35
229237
|
230238
LL | let _: Result<usize, usize> = res.and_then(|_| Err(ext_str.some_field));
231239
| ^^^^-------------------------------------
232240
| |
233241
| help: use `and(..)` instead: `and(Err(ext_str.some_field))`
234242

235243
error: unnecessary closure used to substitute value for `Result::Err`
236-
--> $DIR/unnecessary_lazy_eval.rs:115:35
244+
--> $DIR/unnecessary_lazy_eval.rs:117:35
237245
|
238246
LL | let _: Result<usize, usize> = res.or_else(|_| Ok(2));
239247
| ^^^^------------------
240248
| |
241249
| help: use `or(..)` instead: `or(Ok(2))`
242250

243251
error: unnecessary closure used to substitute value for `Result::Err`
244-
--> $DIR/unnecessary_lazy_eval.rs:116:35
252+
--> $DIR/unnecessary_lazy_eval.rs:118:35
245253
|
246254
LL | let _: Result<usize, usize> = res.or_else(|_| Ok(astronomers_pi));
247255
| ^^^^-------------------------------
248256
| |
249257
| help: use `or(..)` instead: `or(Ok(astronomers_pi))`
250258

251259
error: unnecessary closure used to substitute value for `Result::Err`
252-
--> $DIR/unnecessary_lazy_eval.rs:117:35
260+
--> $DIR/unnecessary_lazy_eval.rs:119:35
253261
|
254262
LL | let _: Result<usize, usize> = res.or_else(|_| Ok(ext_str.some_field));
255263
| ^^^^-----------------------------------
256264
| |
257265
| help: use `or(..)` instead: `or(Ok(ext_str.some_field))`
258266

259267
error: unnecessary closure used to substitute value for `Result::Err`
260-
--> $DIR/unnecessary_lazy_eval.rs:118:35
268+
--> $DIR/unnecessary_lazy_eval.rs:120:35
261269
|
262270
LL | let _: Result<usize, usize> = res.
263271
| ___________________________________^
@@ -271,5 +279,5 @@ LL | | or_else(|_| Ok(ext_str.some_field));
271279
| |
272280
| help: use `or(..)` instead: `or(Ok(ext_str.some_field))`
273281

274-
error: aborting due to 33 previous errors
282+
error: aborting due to 34 previous errors
275283

0 commit comments

Comments
 (0)