Skip to content

Commit 37dde3f

Browse files
est31est31
committed
Fix clippy
1 parent 9c7ae38 commit 37dde3f

File tree

8 files changed

+45
-48
lines changed

8 files changed

+45
-48
lines changed

‎src/tools/clippy/clippy_dev/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(let_chains)]
2-
#![feature(let_else)]
2+
#![cfg_attr(bootstrap, feature(let_else))]
33
#![feature(once_cell)]
44
#![feature(rustc_private)]
55
#![cfg_attr(feature = "deny-warnings", deny(warnings))]

‎src/tools/clippy/clippy_lints/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#![feature(drain_filter)]
66
#![feature(iter_intersperse)]
77
#![feature(let_chains)]
8-
#![feature(let_else)]
8+
#![cfg_attr(bootstrap, feature(let_else))]
99
#![feature(lint_reasons)]
1010
#![feature(never_type)]
1111
#![feature(once_cell)]

‎src/tools/clippy/clippy_utils/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![feature(array_chunks)]
22
#![feature(box_patterns)]
33
#![feature(control_flow_enum)]
4-
#![feature(let_else)]
54
#![feature(let_chains)]
65
#![feature(lint_reasons)]
6+
#![cfg_attr(bootstrap, feature(let_else))]
77
#![feature(once_cell)]
88
#![feature(rustc_private)]
99
#![recursion_limit = "512"]

‎src/tools/clippy/tests/ui/needless_return.fixed

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-rustfix
22

33
#![feature(lint_reasons)]
4-
#![feature(let_else)]
54
#![allow(unused)]
65
#![allow(
76
clippy::if_same_then_else,

‎src/tools/clippy/tests/ui/needless_return.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-rustfix
22

33
#![feature(lint_reasons)]
4-
#![feature(let_else)]
54
#![allow(unused)]
65
#![allow(
76
clippy::if_same_then_else,

‎src/tools/clippy/tests/ui/needless_return.stderr

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,223 +1,223 @@
11
error: unneeded `return` statement
2-
--> $DIR/needless_return.rs:27:5
2+
--> $DIR/needless_return.rs:26:5
33
|
44
LL | return true;
55
| ^^^^^^^^^^^^ help: remove `return`: `true`
66
|
77
= note: `-D clippy::needless-return` implied by `-D warnings`
88

99
error: unneeded `return` statement
10-
--> $DIR/needless_return.rs:31:5
10+
--> $DIR/needless_return.rs:30:5
1111
|
1212
LL | return true;
1313
| ^^^^^^^^^^^^ help: remove `return`: `true`
1414

1515
error: unneeded `return` statement
16-
--> $DIR/needless_return.rs:36:9
16+
--> $DIR/needless_return.rs:35:9
1717
|
1818
LL | return true;
1919
| ^^^^^^^^^^^^ help: remove `return`: `true`
2020

2121
error: unneeded `return` statement
22-
--> $DIR/needless_return.rs:38:9
22+
--> $DIR/needless_return.rs:37:9
2323
|
2424
LL | return false;
2525
| ^^^^^^^^^^^^^ help: remove `return`: `false`
2626

2727
error: unneeded `return` statement
28-
--> $DIR/needless_return.rs:44:17
28+
--> $DIR/needless_return.rs:43:17
2929
|
3030
LL | true => return false,
3131
| ^^^^^^^^^^^^ help: remove `return`: `false`
3232

3333
error: unneeded `return` statement
34-
--> $DIR/needless_return.rs:46:13
34+
--> $DIR/needless_return.rs:45:13
3535
|
3636
LL | return true;
3737
| ^^^^^^^^^^^^ help: remove `return`: `true`
3838

3939
error: unneeded `return` statement
40-
--> $DIR/needless_return.rs:53:9
40+
--> $DIR/needless_return.rs:52:9
4141
|
4242
LL | return true;
4343
| ^^^^^^^^^^^^ help: remove `return`: `true`
4444

4545
error: unneeded `return` statement
46-
--> $DIR/needless_return.rs:55:16
46+
--> $DIR/needless_return.rs:54:16
4747
|
4848
LL | let _ = || return true;
4949
| ^^^^^^^^^^^ help: remove `return`: `true`
5050

5151
error: unneeded `return` statement
52-
--> $DIR/needless_return.rs:59:5
52+
--> $DIR/needless_return.rs:58:5
5353
|
5454
LL | return the_answer!();
5555
| ^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `the_answer!()`
5656

5757
error: unneeded `return` statement
58-
--> $DIR/needless_return.rs:63:5
58+
--> $DIR/needless_return.rs:62:5
5959
|
6060
LL | return;
6161
| ^^^^^^^ help: remove `return`
6262

6363
error: unneeded `return` statement
64-
--> $DIR/needless_return.rs:68:9
64+
--> $DIR/needless_return.rs:67:9
6565
|
6666
LL | return;
6767
| ^^^^^^^ help: remove `return`
6868

6969
error: unneeded `return` statement
70-
--> $DIR/needless_return.rs:70:9
70+
--> $DIR/needless_return.rs:69:9
7171
|
7272
LL | return;
7373
| ^^^^^^^ help: remove `return`
7474

7575
error: unneeded `return` statement
76-
--> $DIR/needless_return.rs:77:14
76+
--> $DIR/needless_return.rs:76:14
7777
|
7878
LL | _ => return,
7979
| ^^^^^^ help: replace `return` with a unit value: `()`
8080

8181
error: unneeded `return` statement
82-
--> $DIR/needless_return.rs:86:13
82+
--> $DIR/needless_return.rs:85:13
8383
|
8484
LL | return;
8585
| ^^^^^^^ help: remove `return`
8686

8787
error: unneeded `return` statement
88-
--> $DIR/needless_return.rs:88:14
88+
--> $DIR/needless_return.rs:87:14
8989
|
9090
LL | _ => return,
9191
| ^^^^^^ help: replace `return` with a unit value: `()`
9292

9393
error: unneeded `return` statement
94-
--> $DIR/needless_return.rs:101:9
94+
--> $DIR/needless_return.rs:100:9
9595
|
9696
LL | return String::from("test");
9797
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `String::from("test")`
9898

9999
error: unneeded `return` statement
100-
--> $DIR/needless_return.rs:103:9
100+
--> $DIR/needless_return.rs:102:9
101101
|
102102
LL | return String::new();
103103
| ^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `String::new()`
104104

105105
error: unneeded `return` statement
106-
--> $DIR/needless_return.rs:125:32
106+
--> $DIR/needless_return.rs:124:32
107107
|
108108
LL | bar.unwrap_or_else(|_| return)
109109
| ^^^^^^ help: replace `return` with an empty block: `{}`
110110

111111
error: unneeded `return` statement
112-
--> $DIR/needless_return.rs:130:13
112+
--> $DIR/needless_return.rs:129:13
113113
|
114114
LL | return;
115115
| ^^^^^^^ help: remove `return`
116116

117117
error: unneeded `return` statement
118-
--> $DIR/needless_return.rs:132:20
118+
--> $DIR/needless_return.rs:131:20
119119
|
120120
LL | let _ = || return;
121121
| ^^^^^^ help: replace `return` with an empty block: `{}`
122122

123123
error: unneeded `return` statement
124-
--> $DIR/needless_return.rs:138:32
124+
--> $DIR/needless_return.rs:137:32
125125
|
126126
LL | res.unwrap_or_else(|_| return Foo)
127127
| ^^^^^^^^^^ help: remove `return`: `Foo`
128128

129129
error: unneeded `return` statement
130-
--> $DIR/needless_return.rs:147:5
130+
--> $DIR/needless_return.rs:146:5
131131
|
132132
LL | return true;
133133
| ^^^^^^^^^^^^ help: remove `return`: `true`
134134

135135
error: unneeded `return` statement
136-
--> $DIR/needless_return.rs:151:5
136+
--> $DIR/needless_return.rs:150:5
137137
|
138138
LL | return true;
139139
| ^^^^^^^^^^^^ help: remove `return`: `true`
140140

141141
error: unneeded `return` statement
142-
--> $DIR/needless_return.rs:156:9
142+
--> $DIR/needless_return.rs:155:9
143143
|
144144
LL | return true;
145145
| ^^^^^^^^^^^^ help: remove `return`: `true`
146146

147147
error: unneeded `return` statement
148-
--> $DIR/needless_return.rs:158:9
148+
--> $DIR/needless_return.rs:157:9
149149
|
150150
LL | return false;
151151
| ^^^^^^^^^^^^^ help: remove `return`: `false`
152152

153153
error: unneeded `return` statement
154-
--> $DIR/needless_return.rs:164:17
154+
--> $DIR/needless_return.rs:163:17
155155
|
156156
LL | true => return false,
157157
| ^^^^^^^^^^^^ help: remove `return`: `false`
158158

159159
error: unneeded `return` statement
160-
--> $DIR/needless_return.rs:166:13
160+
--> $DIR/needless_return.rs:165:13
161161
|
162162
LL | return true;
163163
| ^^^^^^^^^^^^ help: remove `return`: `true`
164164

165165
error: unneeded `return` statement
166-
--> $DIR/needless_return.rs:173:9
166+
--> $DIR/needless_return.rs:172:9
167167
|
168168
LL | return true;
169169
| ^^^^^^^^^^^^ help: remove `return`: `true`
170170

171171
error: unneeded `return` statement
172-
--> $DIR/needless_return.rs:175:16
172+
--> $DIR/needless_return.rs:174:16
173173
|
174174
LL | let _ = || return true;
175175
| ^^^^^^^^^^^ help: remove `return`: `true`
176176

177177
error: unneeded `return` statement
178-
--> $DIR/needless_return.rs:179:5
178+
--> $DIR/needless_return.rs:178:5
179179
|
180180
LL | return the_answer!();
181181
| ^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `the_answer!()`
182182

183183
error: unneeded `return` statement
184-
--> $DIR/needless_return.rs:183:5
184+
--> $DIR/needless_return.rs:182:5
185185
|
186186
LL | return;
187187
| ^^^^^^^ help: remove `return`
188188

189189
error: unneeded `return` statement
190-
--> $DIR/needless_return.rs:188:9
190+
--> $DIR/needless_return.rs:187:9
191191
|
192192
LL | return;
193193
| ^^^^^^^ help: remove `return`
194194

195195
error: unneeded `return` statement
196-
--> $DIR/needless_return.rs:190:9
196+
--> $DIR/needless_return.rs:189:9
197197
|
198198
LL | return;
199199
| ^^^^^^^ help: remove `return`
200200

201201
error: unneeded `return` statement
202-
--> $DIR/needless_return.rs:197:14
202+
--> $DIR/needless_return.rs:196:14
203203
|
204204
LL | _ => return,
205205
| ^^^^^^ help: replace `return` with a unit value: `()`
206206

207207
error: unneeded `return` statement
208-
--> $DIR/needless_return.rs:210:9
208+
--> $DIR/needless_return.rs:209:9
209209
|
210210
LL | return String::from("test");
211211
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `String::from("test")`
212212

213213
error: unneeded `return` statement
214-
--> $DIR/needless_return.rs:212:9
214+
--> $DIR/needless_return.rs:211:9
215215
|
216216
LL | return String::new();
217217
| ^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `String::new()`
218218

219219
error: unneeded `return` statement
220-
--> $DIR/needless_return.rs:228:5
220+
--> $DIR/needless_return.rs:227:5
221221
|
222222
LL | return format!("Hello {}", "world!");
223223
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `return`: `format!("Hello {}", "world!")`

‎src/tools/clippy/tests/ui/semicolon_if_nothing_returned.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![warn(clippy::semicolon_if_nothing_returned)]
22
#![allow(clippy::redundant_closure)]
3-
#![feature(let_else)]
43

54
fn get_unit() {}
65

‎src/tools/clippy/tests/ui/semicolon_if_nothing_returned.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
error: consider adding a `;` to the last statement for consistent formatting
2-
--> $DIR/semicolon_if_nothing_returned.rs:9:5
2+
--> $DIR/semicolon_if_nothing_returned.rs:8:5
33
|
44
LL | println!("Hello")
55
| ^^^^^^^^^^^^^^^^^ help: add a `;` here: `println!("Hello");`
66
|
77
= note: `-D clippy::semicolon-if-nothing-returned` implied by `-D warnings`
88

99
error: consider adding a `;` to the last statement for consistent formatting
10-
--> $DIR/semicolon_if_nothing_returned.rs:13:5
10+
--> $DIR/semicolon_if_nothing_returned.rs:12:5
1111
|
1212
LL | get_unit()
1313
| ^^^^^^^^^^ help: add a `;` here: `get_unit();`
1414

1515
error: consider adding a `;` to the last statement for consistent formatting
16-
--> $DIR/semicolon_if_nothing_returned.rs:18:5
16+
--> $DIR/semicolon_if_nothing_returned.rs:17:5
1717
|
1818
LL | y = x + 1
1919
| ^^^^^^^^^ help: add a `;` here: `y = x + 1;`
2020

2121
error: consider adding a `;` to the last statement for consistent formatting
22-
--> $DIR/semicolon_if_nothing_returned.rs:24:9
22+
--> $DIR/semicolon_if_nothing_returned.rs:23:9
2323
|
2424
LL | hello()
2525
| ^^^^^^^ help: add a `;` here: `hello();`
2626

2727
error: consider adding a `;` to the last statement for consistent formatting
28-
--> $DIR/semicolon_if_nothing_returned.rs:35:9
28+
--> $DIR/semicolon_if_nothing_returned.rs:34:9
2929
|
3030
LL | ptr::drop_in_place(s.as_mut_ptr())
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add a `;` here: `ptr::drop_in_place(s.as_mut_ptr());`

0 commit comments

Comments
 (0)