Skip to content

Commit ce847be

Browse files
committed
Revert let_chains stabilization
This reverts commit 3266460. This is the revert against master, the beta revert was already done in rust-lang#100538.
1 parent e4eddc6 commit ce847be

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

clippy_dev/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![feature(let_chains)]
12
#![feature(let_else)]
23
#![feature(once_cell)]
34
#![feature(rustc_private)]

clippy_lints/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#![feature(control_flow_enum)]
55
#![feature(drain_filter)]
66
#![feature(iter_intersperse)]
7+
#![feature(let_chains)]
78
#![feature(let_else)]
89
#![feature(lint_reasons)]
910
#![feature(never_type)]

clippy_utils/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![feature(box_patterns)]
33
#![feature(control_flow_enum)]
44
#![feature(let_else)]
5+
#![feature(let_chains)]
56
#![feature(lint_reasons)]
67
#![feature(once_cell)]
78
#![feature(rustc_private)]

tests/ui/needless_late_init.fixed

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-rustfix
2+
#![feature(let_chains)]
23
#![allow(
34
unused,
45
clippy::assign_op_pattern,

tests/ui/needless_late_init.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-rustfix
2+
#![feature(let_chains)]
23
#![allow(
34
unused,
45
clippy::assign_op_pattern,

tests/ui/needless_late_init.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unneeded late initialization
2-
--> $DIR/needless_late_init.rs:22:5
2+
--> $DIR/needless_late_init.rs:23:5
33
|
44
LL | let a;
55
| ^^^^^^ created here
@@ -13,7 +13,7 @@ LL | let a = "zero";
1313
| ~~~~~
1414

1515
error: unneeded late initialization
16-
--> $DIR/needless_late_init.rs:25:5
16+
--> $DIR/needless_late_init.rs:26:5
1717
|
1818
LL | let b;
1919
| ^^^^^^ created here
@@ -27,7 +27,7 @@ LL | let b = 1;
2727
| ~~~~~
2828

2929
error: unneeded late initialization
30-
--> $DIR/needless_late_init.rs:26:5
30+
--> $DIR/needless_late_init.rs:27:5
3131
|
3232
LL | let c;
3333
| ^^^^^^ created here
@@ -41,7 +41,7 @@ LL | let c = 2;
4141
| ~~~~~
4242

4343
error: unneeded late initialization
44-
--> $DIR/needless_late_init.rs:30:5
44+
--> $DIR/needless_late_init.rs:31:5
4545
|
4646
LL | let d: usize;
4747
| ^^^^^^^^^^^^^ created here
@@ -54,7 +54,7 @@ LL | let d: usize = 1;
5454
| ~~~~~~~~~~~~
5555

5656
error: unneeded late initialization
57-
--> $DIR/needless_late_init.rs:33:5
57+
--> $DIR/needless_late_init.rs:34:5
5858
|
5959
LL | let e;
6060
| ^^^^^^ created here
@@ -67,7 +67,7 @@ LL | let e = format!("{}", d);
6767
| ~~~~~
6868

6969
error: unneeded late initialization
70-
--> $DIR/needless_late_init.rs:38:5
70+
--> $DIR/needless_late_init.rs:39:5
7171
|
7272
LL | let a;
7373
| ^^^^^^
@@ -88,7 +88,7 @@ LL | };
8888
| +
8989

9090
error: unneeded late initialization
91-
--> $DIR/needless_late_init.rs:47:5
91+
--> $DIR/needless_late_init.rs:48:5
9292
|
9393
LL | let b;
9494
| ^^^^^^
@@ -109,7 +109,7 @@ LL | };
109109
| +
110110

111111
error: unneeded late initialization
112-
--> $DIR/needless_late_init.rs:54:5
112+
--> $DIR/needless_late_init.rs:55:5
113113
|
114114
LL | let d;
115115
| ^^^^^^
@@ -130,7 +130,7 @@ LL | };
130130
| +
131131

132132
error: unneeded late initialization
133-
--> $DIR/needless_late_init.rs:62:5
133+
--> $DIR/needless_late_init.rs:63:5
134134
|
135135
LL | let e;
136136
| ^^^^^^
@@ -151,7 +151,7 @@ LL | };
151151
| +
152152

153153
error: unneeded late initialization
154-
--> $DIR/needless_late_init.rs:69:5
154+
--> $DIR/needless_late_init.rs:70:5
155155
|
156156
LL | let f;
157157
| ^^^^^^
@@ -167,7 +167,7 @@ LL + 1 => "three",
167167
|
168168

169169
error: unneeded late initialization
170-
--> $DIR/needless_late_init.rs:75:5
170+
--> $DIR/needless_late_init.rs:76:5
171171
|
172172
LL | let g: usize;
173173
| ^^^^^^^^^^^^^
@@ -187,7 +187,7 @@ LL | };
187187
| +
188188

189189
error: unneeded late initialization
190-
--> $DIR/needless_late_init.rs:83:5
190+
--> $DIR/needless_late_init.rs:84:5
191191
|
192192
LL | let x;
193193
| ^^^^^^ created here
@@ -201,7 +201,7 @@ LL | let x = 1;
201201
| ~~~~~
202202

203203
error: unneeded late initialization
204-
--> $DIR/needless_late_init.rs:87:5
204+
--> $DIR/needless_late_init.rs:88:5
205205
|
206206
LL | let x;
207207
| ^^^^^^ created here
@@ -215,7 +215,7 @@ LL | let x = SignificantDrop;
215215
| ~~~~~
216216

217217
error: unneeded late initialization
218-
--> $DIR/needless_late_init.rs:91:5
218+
--> $DIR/needless_late_init.rs:92:5
219219
|
220220
LL | let x;
221221
| ^^^^^^ created here
@@ -229,7 +229,7 @@ LL | let x = SignificantDrop;
229229
| ~~~~~
230230

231231
error: unneeded late initialization
232-
--> $DIR/needless_late_init.rs:110:5
232+
--> $DIR/needless_late_init.rs:111:5
233233
|
234234
LL | let a;
235235
| ^^^^^^
@@ -250,7 +250,7 @@ LL | };
250250
| +
251251

252252
error: unneeded late initialization
253-
--> $DIR/needless_late_init.rs:127:5
253+
--> $DIR/needless_late_init.rs:128:5
254254
|
255255
LL | let a;
256256
| ^^^^^^

0 commit comments

Comments
 (0)