Skip to content

Commit e9f8713

Browse files
Rollup merge of rust-lang#119819 - chenyukang:yukang-fix-118183-lint, r=davidtwco
Check rust lints when an unknown lint is detected Fixes rust-lang#118183
2 parents 6baa129 + 1485e5c commit e9f8713

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

tests/ui/unknown_clippy_lints.fixed

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
#[warn(clippy::if_not_else)]
88
#[warn(clippy::unnecessary_cast)]
99
#[warn(clippy::useless_transmute)]
10-
// Shouldn't suggest rustc lint name(`dead_code`)
11-
#[warn(clippy::eq_op)]
10+
// Should suggest rustc lint name(`dead_code`)
11+
#[warn(dead_code)]
1212
// Shouldn't suggest removed/deprecated clippy lint name(`unused_collect`)
1313
#[warn(clippy::unused_self)]
1414
// Shouldn't suggest renamed clippy lint name(`const_static_lifetime`)
1515
#[warn(clippy::redundant_static_lifetimes)]
16+
// issue #118183, should report `missing_docs` from rustc lint
17+
#[warn(missing_docs)]
1618
fn main() {}

tests/ui/unknown_clippy_lints.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
#[warn(clippy::if_not_els)]
88
#[warn(clippy::UNNecsaRy_cAst)]
99
#[warn(clippy::useles_transute)]
10-
// Shouldn't suggest rustc lint name(`dead_code`)
10+
// Should suggest rustc lint name(`dead_code`)
1111
#[warn(clippy::dead_cod)]
1212
// Shouldn't suggest removed/deprecated clippy lint name(`unused_collect`)
1313
#[warn(clippy::unused_colle)]
1414
// Shouldn't suggest renamed clippy lint name(`const_static_lifetime`)
1515
#[warn(clippy::const_static_lifetim)]
16+
// issue #118183, should report `missing_docs` from rustc lint
17+
#[warn(clippy::missing_docs)]
1618
fn main() {}

tests/ui/unknown_clippy_lints.stderr

+18-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ error: unknown lint: `clippy::dead_cod`
3535
--> $DIR/unknown_clippy_lints.rs:11:8
3636
|
3737
LL | #[warn(clippy::dead_cod)]
38-
| ^^^^^^^^^^^^^^^^ help: did you mean: `clippy::eq_op`
38+
| ^^^^^^^^^^^^^^^^
39+
|
40+
help: a lint with a similar name exists in `rustc` lints
41+
|
42+
LL | #[warn(dead_code)]
43+
| ~~~~~~~~~
3944

4045
error: unknown lint: `clippy::unused_colle`
4146
--> $DIR/unknown_clippy_lints.rs:13:8
@@ -49,5 +54,16 @@ error: unknown lint: `clippy::const_static_lifetim`
4954
LL | #[warn(clippy::const_static_lifetim)]
5055
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::redundant_static_lifetimes`
5156

52-
error: aborting due to 8 previous errors
57+
error: unknown lint: `clippy::missing_docs`
58+
--> $DIR/unknown_clippy_lints.rs:17:8
59+
|
60+
LL | #[warn(clippy::missing_docs)]
61+
| ^^^^^^^^^^^^^^^^^^^^
62+
|
63+
help: a lint with a similar name exists in `rustc` lints
64+
|
65+
LL | #[warn(missing_docs)]
66+
| ~~~~~~~~~~~~
67+
68+
error: aborting due to 9 previous errors
5369

0 commit comments

Comments
 (0)