diff options
| author | flip1995 <hello@philkrones.com> | 2020-05-28 15:45:24 +0200 |
|---|---|---|
| committer | flip1995 <hello@philkrones.com> | 2020-05-28 15:45:24 +0200 |
| commit | a0e9f9bd0dca39ccff47baedffa94aca74911a86 (patch) | |
| tree | ff326c800e6850dcb2109284dd5070d1126616f4 /src | |
| parent | e820a03d1c905d58b27d7ac6d85f450f9754ba79 (diff) | |
| download | rust-a0e9f9bd0dca39ccff47baedffa94aca74911a86.tar.gz rust-a0e9f9bd0dca39ccff47baedffa94aca74911a86.zip | |
Merge commit '7ea7cd165ad6705603852771bf82cc2fd6560db5' into clippyup2
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 d3a7e24937f..70c47b42682 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -79,7 +79,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", }, |