diff options
| author | bors <bors@rust-lang.org> | 2021-01-02 13:12:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-02 13:12:15 +0000 |
| commit | b1965283fd9f90470731ee88b2dfdde69f5407a6 (patch) | |
| tree | 330328ee97471acffb4f0007fec2dce3f0109f29 | |
| parent | 60919e416d16d7293b43a14737a755c34207f043 (diff) | |
| parent | e5a1f22f486d70676620cc67cad45ecf359fb56e (diff) | |
| download | rust-b1965283fd9f90470731ee88b2dfdde69f5407a6.tar.gz rust-b1965283fd9f90470731ee88b2dfdde69f5407a6.zip | |
Auto merge of #6530 - m-ou-se:2021, r=phansch
Initial support for Rust 2021. Clippy treated Rust 2021 as Rust 2015, because 2018 was checked with `==` instead of `>=`. This fixes that, such that 2018-specific things are also enabled for 2021. changelog: Added support for Rust 2021.
| -rw-r--r-- | clippy_lints/src/macro_use.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/single_component_path_imports.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/macro_use.rs b/clippy_lints/src/macro_use.rs index b4b4b3dc18d..bb52888883a 100644 --- a/clippy_lints/src/macro_use.rs +++ b/clippy_lints/src/macro_use.rs @@ -105,7 +105,7 @@ impl MacroUseImports { impl<'tcx> LateLintPass<'tcx> for MacroUseImports { fn check_item(&mut self, cx: &LateContext<'_>, item: &hir::Item<'_>) { if_chain! { - if cx.sess().opts.edition == Edition::Edition2018; + if cx.sess().opts.edition >= Edition::Edition2018; if let hir::ItemKind::Use(path, _kind) = &item.kind; if let Some(mac_attr) = item .attrs diff --git a/clippy_lints/src/single_component_path_imports.rs b/clippy_lints/src/single_component_path_imports.rs index 35b38eca14d..1fc4ff5c2e6 100644 --- a/clippy_lints/src/single_component_path_imports.rs +++ b/clippy_lints/src/single_component_path_imports.rs @@ -40,7 +40,7 @@ impl EarlyLintPass for SingleComponentPathImports { fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) { if_chain! { if !in_macro(item.span); - if cx.sess.opts.edition == Edition::Edition2018; + if cx.sess.opts.edition >= Edition::Edition2018; if !item.vis.kind.is_pub(); if let ItemKind::Use(use_tree) = &item.kind; if let segments = &use_tree.prefix.segments; |