diff options
| author | bors <bors@rust-lang.org> | 2020-05-29 11:16:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-29 11:16:45 +0000 |
| commit | fcc0e8f7d4dda4b505131f68ab8d4a806024e8cd (patch) | |
| tree | 75fcfa69e26861ab6087b4cee88a59ed90ee2032 /src | |
| parent | 28c690e07ed02a7207f3d82ff8df4d2753b4b78d (diff) | |
| parent | b6c58f0d723d6178506773fa9a4dba9de08ce90a (diff) | |
| download | rust-fcc0e8f7d4dda4b505131f68ab8d4a806024e8cd.tar.gz rust-fcc0e8f7d4dda4b505131f68ab8d4a806024e8cd.zip | |
Auto merge of #72671 - flip1995:clippyup, r=Xanewok
Update Clippy, RLS, and rustfmt r? @Dylan-DPC This makes Clippy test-pass again: 3089c3b Otherwise this includes bugfixes and a few new lints. Fixes #72231 Fixes #72232
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver.rs | 2 | ||||
| -rw-r--r-- | src/lintlist/mod.rs | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/driver.rs b/src/driver.rs index 3e1f423865b..4453ae5ce44 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -78,7 +78,7 @@ impl rustc_driver::Callbacks for ClippyCallbacks { let conf = clippy_lints::read_conf(&[], &sess); clippy_lints::register_plugins(&mut lint_store, &sess, &conf); - clippy_lints::register_pre_expansion_lints(&mut lint_store, &conf); + clippy_lints::register_pre_expansion_lints(&mut lint_store); clippy_lints::register_renamed(&mut lint_store); })); diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs index 9457a64f9c6..f63301c7db0 100644 --- a/src/lintlist/mod.rs +++ b/src/lintlist/mod.rs @@ -1195,12 +1195,19 @@ pub static ref ALL_LINTS: Vec<Lint> = vec![ }, Lint { name: "match_wild_err_arm", - group: "style", + group: "pedantic", desc: "a `match` with `Err(_)` arm and take drastic actions", deprecation: None, module: "matches", }, Lint { + name: "match_wildcard_for_single_variants", + group: "pedantic", + desc: "a wildcard enum match for a single variant", + deprecation: None, + module: "matches", + }, + Lint { name: "maybe_infinite_iter", group: "pedantic", desc: "possible infinite iteration", @@ -2414,7 +2421,7 @@ pub static ref ALL_LINTS: Vec<Lint> = vec![ Lint { name: "useless_conversion", group: "complexity", - desc: "calls to `Into`/`From`/`IntoIter` that performs useless conversions to the same type", + desc: "calls to `Into`, `TryInto`, `From`, `TryFrom`, `IntoIter` that performs useless conversions to the same type", deprecation: None, module: "useless_conversion", }, |