Skip to content

Commit b0f358f

Browse files
Update ui test
1 parent fadb254 commit b0f358f

14 files changed

+113
-98
lines changed

tests/ui/manual_let_else.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
clippy::never_loop,
99
clippy::needless_if,
1010
clippy::diverging_sub_expression,
11-
clippy::single_match
11+
clippy::single_match,
12+
clippy::manual_unwrap_or_default
1213
)]
1314
#![warn(clippy::manual_let_else)]
1415
//@no-rustfix

tests/ui/manual_let_else.stderr

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: this could be rewritten as `let...else`
2-
--> tests/ui/manual_let_else.rs:28:5
2+
--> tests/ui/manual_let_else.rs:29:5
33
|
44
LL | let v = if let Some(v_some) = g() { v_some } else { return };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Some(v) = g() else { return };`
@@ -8,7 +8,7 @@ LL | let v = if let Some(v_some) = g() { v_some } else { return };
88
= help: to override `-D warnings` add `#[allow(clippy::manual_let_else)]`
99

1010
error: this could be rewritten as `let...else`
11-
--> tests/ui/manual_let_else.rs:31:5
11+
--> tests/ui/manual_let_else.rs:32:5
1212
|
1313
LL | / let v = if let Some(v_some) = g() {
1414
LL | |
@@ -26,7 +26,7 @@ LL + };
2626
|
2727

2828
error: this could be rewritten as `let...else`
29-
--> tests/ui/manual_let_else.rs:38:5
29+
--> tests/ui/manual_let_else.rs:39:5
3030
|
3131
LL | / let v = if let Some(v) = g() {
3232
LL | |
@@ -47,25 +47,25 @@ LL + };
4747
|
4848

4949
error: this could be rewritten as `let...else`
50-
--> tests/ui/manual_let_else.rs:50:9
50+
--> tests/ui/manual_let_else.rs:51:9
5151
|
5252
LL | let v = if let Some(v_some) = g() { v_some } else { continue };
5353
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Some(v) = g() else { continue };`
5454

5555
error: this could be rewritten as `let...else`
56-
--> tests/ui/manual_let_else.rs:52:9
56+
--> tests/ui/manual_let_else.rs:53:9
5757
|
5858
LL | let v = if let Some(v_some) = g() { v_some } else { break };
5959
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Some(v) = g() else { break };`
6060

6161
error: this could be rewritten as `let...else`
62-
--> tests/ui/manual_let_else.rs:57:5
62+
--> tests/ui/manual_let_else.rs:58:5
6363
|
6464
LL | let v = if let Some(v_some) = g() { v_some } else { panic!() };
6565
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Some(v) = g() else { panic!() };`
6666

6767
error: this could be rewritten as `let...else`
68-
--> tests/ui/manual_let_else.rs:61:5
68+
--> tests/ui/manual_let_else.rs:62:5
6969
|
7070
LL | / let v = if let Some(v_some) = g() {
7171
LL | |
@@ -83,7 +83,7 @@ LL + };
8383
|
8484

8585
error: this could be rewritten as `let...else`
86-
--> tests/ui/manual_let_else.rs:69:5
86+
--> tests/ui/manual_let_else.rs:70:5
8787
|
8888
LL | / let v = if let Some(v_some) = g() {
8989
LL | |
@@ -101,7 +101,7 @@ LL + };
101101
|
102102

103103
error: this could be rewritten as `let...else`
104-
--> tests/ui/manual_let_else.rs:77:5
104+
--> tests/ui/manual_let_else.rs:78:5
105105
|
106106
LL | / let v = if let Some(v_some) = g() {
107107
LL | |
@@ -121,7 +121,7 @@ LL + };
121121
|
122122

123123
error: this could be rewritten as `let...else`
124-
--> tests/ui/manual_let_else.rs:86:5
124+
--> tests/ui/manual_let_else.rs:87:5
125125
|
126126
LL | / let v = if let Some(v_some) = g() {
127127
LL | |
@@ -141,7 +141,7 @@ LL + };
141141
|
142142

143143
error: this could be rewritten as `let...else`
144-
--> tests/ui/manual_let_else.rs:95:5
144+
--> tests/ui/manual_let_else.rs:96:5
145145
|
146146
LL | / let v = if let Some(v_some) = g() {
147147
LL | |
@@ -168,7 +168,7 @@ LL + };
168168
|
169169

170170
error: this could be rewritten as `let...else`
171-
--> tests/ui/manual_let_else.rs:111:5
171+
--> tests/ui/manual_let_else.rs:112:5
172172
|
173173
LL | / let v = if let Some(v_some) = g() {
174174
LL | |
@@ -190,7 +190,7 @@ LL + };
190190
|
191191

192192
error: this could be rewritten as `let...else`
193-
--> tests/ui/manual_let_else.rs:122:5
193+
--> tests/ui/manual_let_else.rs:123:5
194194
|
195195
LL | / let v = if let Some(v_some) = g() {
196196
LL | |
@@ -217,7 +217,7 @@ LL + };
217217
|
218218

219219
error: this could be rewritten as `let...else`
220-
--> tests/ui/manual_let_else.rs:138:5
220+
--> tests/ui/manual_let_else.rs:139:5
221221
|
222222
LL | / let v = if let Some(v_some) = g() {
223223
LL | |
@@ -239,7 +239,7 @@ LL + };
239239
|
240240

241241
error: this could be rewritten as `let...else`
242-
--> tests/ui/manual_let_else.rs:149:5
242+
--> tests/ui/manual_let_else.rs:150:5
243243
|
244244
LL | / let v = if let Some(v_some) = g() {
245245
LL | |
@@ -257,7 +257,7 @@ LL + };
257257
|
258258

259259
error: this could be rewritten as `let...else`
260-
--> tests/ui/manual_let_else.rs:157:5
260+
--> tests/ui/manual_let_else.rs:158:5
261261
|
262262
LL | / let v = if let Some(v_some) = g() {
263263
LL | |
@@ -278,7 +278,7 @@ LL + };
278278
|
279279

280280
error: this could be rewritten as `let...else`
281-
--> tests/ui/manual_let_else.rs:167:5
281+
--> tests/ui/manual_let_else.rs:168:5
282282
|
283283
LL | / let v = if let Some(v_some) = g() {
284284
LL | |
@@ -299,7 +299,7 @@ LL + } };
299299
|
300300

301301
error: this could be rewritten as `let...else`
302-
--> tests/ui/manual_let_else.rs:177:5
302+
--> tests/ui/manual_let_else.rs:178:5
303303
|
304304
LL | / let v = if let Some(v_some) = g() {
305305
LL | |
@@ -328,7 +328,7 @@ LL + };
328328
|
329329

330330
error: this could be rewritten as `let...else`
331-
--> tests/ui/manual_let_else.rs:195:5
331+
--> tests/ui/manual_let_else.rs:196:5
332332
|
333333
LL | / let (v, w) = if let Some(v_some) = g().map(|v| (v, 42)) {
334334
LL | |
@@ -346,7 +346,7 @@ LL + };
346346
|
347347

348348
error: this could be rewritten as `let...else`
349-
--> tests/ui/manual_let_else.rs:203:5
349+
--> tests/ui/manual_let_else.rs:204:5
350350
|
351351
LL | / let (w, S { v }) = if let (Some(v_some), w_some) = (g().map(|_| S { v: 0 }), 0) {
352352
LL | |
@@ -364,7 +364,7 @@ LL + };
364364
|
365365

366366
error: this could be rewritten as `let...else`
367-
--> tests/ui/manual_let_else.rs:213:13
367+
--> tests/ui/manual_let_else.rs:214:13
368368
|
369369
LL | let $n = if let Some(v) = $e { v } else { return };
370370
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Some($n) = g() else { return };`
@@ -375,19 +375,19 @@ LL | create_binding_if_some!(w, g());
375375
= note: this error originates in the macro `create_binding_if_some` (in Nightly builds, run with -Z macro-backtrace for more info)
376376

377377
error: this could be rewritten as `let...else`
378-
--> tests/ui/manual_let_else.rs:222:5
378+
--> tests/ui/manual_let_else.rs:223:5
379379
|
380380
LL | let v = if let Variant::A(a, 0) = e() { a } else { return };
381381
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Variant::A(v, 0) = e() else { return };`
382382

383383
error: this could be rewritten as `let...else`
384-
--> tests/ui/manual_let_else.rs:226:5
384+
--> tests/ui/manual_let_else.rs:227:5
385385
|
386386
LL | let mut v = if let Variant::B(b) = e() { b } else { return };
387387
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Variant::B(mut v) = e() else { return };`
388388

389389
error: this could be rewritten as `let...else`
390-
--> tests/ui/manual_let_else.rs:231:5
390+
--> tests/ui/manual_let_else.rs:232:5
391391
|
392392
LL | / let v = if let Ok(Some(Variant::B(b))) | Err(Some(Variant::A(b, _))) = nested {
393393
LL | |
@@ -405,19 +405,19 @@ LL + };
405405
|
406406

407407
error: this could be rewritten as `let...else`
408-
--> tests/ui/manual_let_else.rs:238:5
408+
--> tests/ui/manual_let_else.rs:239:5
409409
|
410410
LL | let v = if let Variant::A(.., a) = e() { a } else { return };
411411
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Variant::A(.., v) = e() else { return };`
412412

413413
error: this could be rewritten as `let...else`
414-
--> tests/ui/manual_let_else.rs:242:5
414+
--> tests/ui/manual_let_else.rs:243:5
415415
|
416416
LL | let w = if let (Some(v), ()) = (g(), ()) { v } else { return };
417417
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let (Some(w), ()) = (g(), ()) else { return };`
418418

419419
error: this could be rewritten as `let...else`
420-
--> tests/ui/manual_let_else.rs:246:5
420+
--> tests/ui/manual_let_else.rs:247:5
421421
|
422422
LL | / let w = if let Some(S { v: x }) = Some(S { v: 0 }) {
423423
LL | |
@@ -435,7 +435,7 @@ LL + };
435435
|
436436

437437
error: this could be rewritten as `let...else`
438-
--> tests/ui/manual_let_else.rs:254:5
438+
--> tests/ui/manual_let_else.rs:255:5
439439
|
440440
LL | / let v = if let Some(S { v: x }) = Some(S { v: 0 }) {
441441
LL | |
@@ -453,7 +453,7 @@ LL + };
453453
|
454454

455455
error: this could be rewritten as `let...else`
456-
--> tests/ui/manual_let_else.rs:262:5
456+
--> tests/ui/manual_let_else.rs:263:5
457457
|
458458
LL | / let (x, S { v }, w) = if let Some(U { v, w, x }) = None::<U<S<()>>> {
459459
LL | |
@@ -471,7 +471,7 @@ LL + };
471471
|
472472

473473
error: this could be rewritten as `let...else`
474-
--> tests/ui/manual_let_else.rs:379:5
474+
--> tests/ui/manual_let_else.rs:380:5
475475
|
476476
LL | / let _ = match ff {
477477
LL | |
@@ -481,7 +481,7 @@ LL | | };
481481
| |______^ help: consider writing: `let Some(_) = ff else { macro_call!() };`
482482

483483
error: this could be rewritten as `let...else`
484-
--> tests/ui/manual_let_else.rs:456:9
484+
--> tests/ui/manual_let_else.rs:457:9
485485
|
486486
LL | let v = if let Some(v_some) = g() { v_some } else { return };
487487
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider writing: `let Some(v) = g() else { return };`

tests/ui/manual_unwrap_or.fixed

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#![allow(dead_code)]
2-
#![allow(unused_variables, clippy::unnecessary_wraps, clippy::unnecessary_literal_unwrap)]
2+
#![allow(
3+
unused_variables,
4+
clippy::unnecessary_wraps,
5+
clippy::unnecessary_literal_unwrap,
6+
clippy::manual_unwrap_or_default
7+
)]
38

49
fn option_unwrap_or() {
510
// int case

tests/ui/manual_unwrap_or.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#![allow(dead_code)]
2-
#![allow(unused_variables, clippy::unnecessary_wraps, clippy::unnecessary_literal_unwrap)]
2+
#![allow(
3+
unused_variables,
4+
clippy::unnecessary_wraps,
5+
clippy::unnecessary_literal_unwrap,
6+
clippy::manual_unwrap_or_default
7+
)]
38

49
fn option_unwrap_or() {
510
// int case

0 commit comments

Comments
 (0)