diff --git a/clippy_lints/src/approx_const.rs b/clippy_lints/src/approx_const.rs index e0b94b98dc42..123a0a9d1894 100644 --- a/clippy_lints/src/approx_const.rs +++ b/clippy_lints/src/approx_const.rs @@ -1,8 +1,7 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::symbol; use std::f64::consts as f64; use syntax::ast::{FloatTy, LitFloatType, LitKind}; diff --git a/clippy_lints/src/arithmetic.rs b/clippy_lints/src/arithmetic.rs index 9638cb8fbada..fd252b9ee109 100644 --- a/clippy_lints/src/arithmetic.rs +++ b/clippy_lints/src/arithmetic.rs @@ -1,9 +1,8 @@ use crate::consts::constant_simple; use crate::utils::span_lint; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/as_conversions.rs b/clippy_lints/src/as_conversions.rs index c2e3871226f2..b4b02510ce7d 100644 --- a/clippy_lints/src/as_conversions.rs +++ b/clippy_lints/src/as_conversions.rs @@ -1,6 +1,6 @@ -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; -use rustc_session::declare_tool_lint; +use rustc::lint::in_external_macro; +use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; use crate::utils::span_help_and_lint; diff --git a/clippy_lints/src/assertions_on_constants.rs b/clippy_lints/src/assertions_on_constants.rs index 555825e484f8..2d6832f125f9 100644 --- a/clippy_lints/src/assertions_on_constants.rs +++ b/clippy_lints/src/assertions_on_constants.rs @@ -2,10 +2,9 @@ use crate::consts::{constant, Constant}; use crate::utils::paths; use crate::utils::{is_direct_expn_of, is_expn_of, match_function_call, snippet_opt, span_help_and_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::LitKind; declare_clippy_lint! { diff --git a/clippy_lints/src/assign_ops.rs b/clippy_lints/src/assign_ops.rs index 0fe10a1f589d..7ad0ce232023 100644 --- a/clippy_lints/src/assign_ops.rs +++ b/clippy_lints/src/assign_ops.rs @@ -3,13 +3,12 @@ use crate::utils::{ }; use crate::utils::{higher, sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for `a = a op b` or `a = b commutative_op a` diff --git a/clippy_lints/src/atomic_ordering.rs b/clippy_lints/src/atomic_ordering.rs index fe06c63a553c..2ea19bfeb8b4 100644 --- a/clippy_lints/src/atomic_ordering.rs +++ b/clippy_lints/src/atomic_ordering.rs @@ -1,11 +1,10 @@ use crate::utils::{match_def_path, span_help_and_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_hir::def_id::DefId; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for usage of invalid atomic diff --git a/clippy_lints/src/attrs.rs b/clippy_lints/src/attrs.rs index c57061c0bfa9..515e5af339bc 100644 --- a/clippy_lints/src/attrs.rs +++ b/clippy_lints/src/attrs.rs @@ -6,15 +6,12 @@ use crate::utils::{ span_lint_and_then, without_block_comments, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{ - in_external_macro, CheckLintNameResult, EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintArray, - LintContext, LintPass, -}; +use rustc::lint::in_external_macro; use rustc::ty; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{CheckLintNameResult, EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use rustc_span::symbol::Symbol; use semver::Version; diff --git a/clippy_lints/src/bit_mask.rs b/clippy_lints/src/bit_mask.rs index 6f7efa08f19f..926b1c63ad12 100644 --- a/clippy_lints/src/bit_mask.rs +++ b/clippy_lints/src/bit_mask.rs @@ -2,11 +2,10 @@ use crate::consts::{constant, Constant}; use crate::utils::sugg::Sugg; use crate::utils::{span_lint, span_lint_and_then}; use if_chain::if_chain; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use syntax::ast::LitKind; diff --git a/clippy_lints/src/blacklisted_name.rs b/clippy_lints/src/blacklisted_name.rs index 44c058911ab3..cb68ba598868 100644 --- a/clippy_lints/src/blacklisted_name.rs +++ b/clippy_lints/src/blacklisted_name.rs @@ -1,9 +1,8 @@ use crate::utils::span_lint; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_data_structures::fx::FxHashSet; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; declare_clippy_lint! { /// **What it does:** Checks for usage of blacklisted names for variables, such diff --git a/clippy_lints/src/block_in_if_condition.rs b/clippy_lints/src/block_in_if_condition.rs index 721314fb6669..e1653082736b 100644 --- a/clippy_lints/src/block_in_if_condition.rs +++ b/clippy_lints/src/block_in_if_condition.rs @@ -1,11 +1,11 @@ use crate::utils::*; use matches::matches; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for `if` conditions that use blocks to contain an diff --git a/clippy_lints/src/booleans.rs b/clippy_lints/src/booleans.rs index dd0a021ea388..12f117927160 100644 --- a/clippy_lints/src/booleans.rs +++ b/clippy_lints/src/booleans.rs @@ -3,14 +3,13 @@ use crate::utils::{ span_lint_and_then, SpanlessEq, }; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::intravisit; use rustc_hir::intravisit::*; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast::LitKind; diff --git a/clippy_lints/src/bytecount.rs b/clippy_lints/src/bytecount.rs index e70f1f317c30..2adc3b429067 100644 --- a/clippy_lints/src/bytecount.rs +++ b/clippy_lints/src/bytecount.rs @@ -3,12 +3,11 @@ use crate::utils::{ span_lint_and_sugg, walk_ptrs_ty, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::{Name, UintTy}; declare_clippy_lint! { diff --git a/clippy_lints/src/cargo_common_metadata.rs b/clippy_lints/src/cargo_common_metadata.rs index aa068d834b16..ec53e08f50cd 100644 --- a/clippy_lints/src/cargo_common_metadata.rs +++ b/clippy_lints/src/cargo_common_metadata.rs @@ -3,9 +3,8 @@ use std::path::PathBuf; use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::DUMMY_SP; use syntax::ast::*; diff --git a/clippy_lints/src/checked_conversions.rs b/clippy_lints/src/checked_conversions.rs index bc79688eef5b..88df0772ae5e 100644 --- a/clippy_lints/src/checked_conversions.rs +++ b/clippy_lints/src/checked_conversions.rs @@ -1,11 +1,11 @@ //! lint on manually implemented checked conversions that could be transformed into `try_from` use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::LitKind; use crate::utils::{snippet_with_applicability, span_lint_and_sugg, SpanlessEq}; diff --git a/clippy_lints/src/cognitive_complexity.rs b/clippy_lints/src/cognitive_complexity.rs index 50a7f24cadc8..f1eb64c8ccbf 100644 --- a/clippy_lints/src/cognitive_complexity.rs +++ b/clippy_lints/src/cognitive_complexity.rs @@ -1,11 +1,10 @@ //! calculate cognitive complexity and warn about overly complex functions use rustc::hir::map::Map; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass}; use rustc_hir::intravisit::{walk_expr, FnKind, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use rustc_span::BytePos; use syntax::ast::Attribute; diff --git a/clippy_lints/src/collapsible_if.rs b/clippy_lints/src/collapsible_if.rs index e34dfc9d9993..af309b512699 100644 --- a/clippy_lints/src/collapsible_if.rs +++ b/clippy_lints/src/collapsible_if.rs @@ -13,9 +13,8 @@ //! This lint is **warn** by default use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast; use crate::utils::sugg::Sugg; diff --git a/clippy_lints/src/comparison_chain.rs b/clippy_lints/src/comparison_chain.rs index 4a239abfb50d..d3a3b85b331a 100644 --- a/clippy_lints/src/comparison_chain.rs +++ b/clippy_lints/src/comparison_chain.rs @@ -1,10 +1,9 @@ use crate::utils::{ get_trait_def_id, if_sequence, implements_trait, parent_node_is_if_expr, paths, span_help_and_lint, SpanlessEq, }; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks comparison chains written with `if` that can be diff --git a/clippy_lints/src/consts.rs b/clippy_lints/src/consts.rs index 86799fde8e60..211625aafbf8 100644 --- a/clippy_lints/src/consts.rs +++ b/clippy_lints/src/consts.rs @@ -2,13 +2,13 @@ use crate::utils::{clip, higher, sext, unsext}; use if_chain::if_chain; -use rustc::lint::LateContext; use rustc::ty::subst::{Subst, SubstsRef}; use rustc::ty::{self, Ty, TyCtxt}; use rustc::{bug, span_bug}; use rustc_data_structures::sync::Lrc; use rustc_hir::def::{DefKind, Res}; use rustc_hir::*; +use rustc_lint::LateContext; use rustc_span::symbol::Symbol; use std::cmp::Ordering::{self, Equal}; use std::cmp::PartialOrd; @@ -334,7 +334,7 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> { let result = self .lcx .tcx - .const_eval_resolve(self.param_env, def_id, substs, None) + .const_eval_resolve(self.param_env, def_id, substs, None, None) .ok()?; let result = miri_to_const(&result); if result.is_some() { diff --git a/clippy_lints/src/copies.rs b/clippy_lints/src/copies.rs index 5d04286575ad..0cf8d32d2d0a 100644 --- a/clippy_lints/src/copies.rs +++ b/clippy_lints/src/copies.rs @@ -1,11 +1,10 @@ use crate::utils::{get_parent_expr, higher, if_sequence, same_tys, snippet, span_lint_and_then, span_note_and_lint}; use crate::utils::{SpanlessEq, SpanlessHash}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::Ty; use rustc_data_structures::fx::FxHashMap; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::symbol::Symbol; use std::collections::hash_map::Entry; use std::hash::BuildHasherDefault; diff --git a/clippy_lints/src/copy_iterator.rs b/clippy_lints/src/copy_iterator.rs index d7863b0d9a9c..c1010dd18682 100644 --- a/clippy_lints/src/copy_iterator.rs +++ b/clippy_lints/src/copy_iterator.rs @@ -1,8 +1,7 @@ use crate::utils::{is_copy, match_path, paths, span_note_and_lint}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::{Item, ItemKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for types that implement `Copy` as well as diff --git a/clippy_lints/src/dbg_macro.rs b/clippy_lints/src/dbg_macro.rs index fa19e55af3ab..0d3067f15c77 100644 --- a/clippy_lints/src/dbg_macro.rs +++ b/clippy_lints/src/dbg_macro.rs @@ -1,8 +1,7 @@ use crate::utils::{snippet_opt, span_help_and_lint, span_lint_and_sugg}; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast; use syntax::tokenstream::TokenStream; diff --git a/clippy_lints/src/default_trait_access.rs b/clippy_lints/src/default_trait_access.rs index 253d9b8d542f..0e1380df9216 100644 --- a/clippy_lints/src/default_trait_access.rs +++ b/clippy_lints/src/default_trait_access.rs @@ -1,10 +1,9 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::{any_parent_is_automatically_derived, match_def_path, paths, span_lint_and_sugg}; diff --git a/clippy_lints/src/derive.rs b/clippy_lints/src/derive.rs index c6215afbbd32..a49879e83109 100644 --- a/clippy_lints/src/derive.rs +++ b/clippy_lints/src/derive.rs @@ -1,11 +1,10 @@ use crate::utils::paths; use crate::utils::{is_automatically_derived, is_copy, match_path, span_lint_and_then}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self, Ty}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/doc.rs b/clippy_lints/src/doc.rs index d7c232eec1a2..9a349611b3d0 100644 --- a/clippy_lints/src/doc.rs +++ b/clippy_lints/src/doc.rs @@ -1,10 +1,10 @@ use crate::utils::{match_type, paths, return_ty, span_lint}; use itertools::Itertools; -use rustc::impl_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass}; +use rustc::lint::in_external_macro; use rustc_data_structures::fx::FxHashSet; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::{BytePos, MultiSpan, Span}; use rustc_span::Pos; use std::ops::Range; diff --git a/clippy_lints/src/double_comparison.rs b/clippy_lints/src/double_comparison.rs index d2ff544bd034..934e3ccdf87c 100644 --- a/clippy_lints/src/double_comparison.rs +++ b/clippy_lints/src/double_comparison.rs @@ -1,10 +1,9 @@ //! Lint on unnecessary double comparisons. Some examples: -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use crate::utils::{snippet_with_applicability, span_lint_and_sugg, SpanlessEq}; diff --git a/clippy_lints/src/double_parens.rs b/clippy_lints/src/double_parens.rs index 52a5e2a1a49d..d08981e8badc 100644 --- a/clippy_lints/src/double_parens.rs +++ b/clippy_lints/src/double_parens.rs @@ -1,7 +1,6 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; declare_clippy_lint! { diff --git a/clippy_lints/src/drop_bounds.rs b/clippy_lints/src/drop_bounds.rs index 825f3b8de74e..1d445a153231 100644 --- a/clippy_lints/src/drop_bounds.rs +++ b/clippy_lints/src/drop_bounds.rs @@ -1,9 +1,8 @@ use crate::utils::{match_def_path, paths, span_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::LateLintPass; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for generics with `std::ops::Drop` as bounds. @@ -39,12 +38,12 @@ const DROP_BOUNDS_SUMMARY: &str = "Bounds of the form `T: Drop` are useless. \ declare_lint_pass!(DropBounds => [DROP_BOUNDS]); impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DropBounds { - fn check_generic_param(&mut self, cx: &rustc::lint::LateContext<'a, 'tcx>, p: &'tcx GenericParam<'_>) { + fn check_generic_param(&mut self, cx: &rustc_lint::LateContext<'a, 'tcx>, p: &'tcx GenericParam<'_>) { for bound in p.bounds.iter() { lint_bound(cx, bound); } } - fn check_where_predicate(&mut self, cx: &rustc::lint::LateContext<'a, 'tcx>, p: &'tcx WherePredicate<'_>) { + fn check_where_predicate(&mut self, cx: &rustc_lint::LateContext<'a, 'tcx>, p: &'tcx WherePredicate<'_>) { if let WherePredicate::BoundPredicate(WhereBoundPredicate { bounds, .. }) = p { for bound in *bounds { lint_bound(cx, bound); @@ -53,7 +52,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DropBounds { } } -fn lint_bound<'a, 'tcx>(cx: &rustc::lint::LateContext<'a, 'tcx>, bound: &'tcx GenericBound<'_>) { +fn lint_bound<'a, 'tcx>(cx: &rustc_lint::LateContext<'a, 'tcx>, bound: &'tcx GenericBound<'_>) { if_chain! { if let GenericBound::Trait(t, _) = bound; if let Some(def_id) = t.trait_ref.path.res.opt_def_id(); diff --git a/clippy_lints/src/drop_forget_ref.rs b/clippy_lints/src/drop_forget_ref.rs index d8ce2fcf661a..d9ce102314b2 100644 --- a/clippy_lints/src/drop_forget_ref.rs +++ b/clippy_lints/src/drop_forget_ref.rs @@ -1,10 +1,9 @@ use crate::utils::{is_copy, match_def_path, paths, qpath_res, span_note_and_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for calls to `std::mem::drop` with a reference diff --git a/clippy_lints/src/duration_subsec.rs b/clippy_lints/src/duration_subsec.rs index 0ec9cc9084ab..366996fb381b 100644 --- a/clippy_lints/src/duration_subsec.rs +++ b/clippy_lints/src/duration_subsec.rs @@ -1,9 +1,8 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Spanned; use crate::consts::{constant, Constant}; diff --git a/clippy_lints/src/else_if_without_else.rs b/clippy_lints/src/else_if_without_else.rs index 8043a8c85555..5360b2e086ff 100644 --- a/clippy_lints/src/else_if_without_else.rs +++ b/clippy_lints/src/else_if_without_else.rs @@ -1,8 +1,8 @@ //! Lint on if expressions with an else if, but without a final else branch. -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; -use rustc_session::declare_tool_lint; +use rustc::lint::in_external_macro; +use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; use crate::utils::span_help_and_lint; diff --git a/clippy_lints/src/empty_enum.rs b/clippy_lints/src/empty_enum.rs index f16a71fe63f0..0a8d9977845e 100644 --- a/clippy_lints/src/empty_enum.rs +++ b/clippy_lints/src/empty_enum.rs @@ -1,10 +1,9 @@ //! lint when there is an enum with no variants use crate::utils::span_lint_and_then; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for `enum`s with no variants. diff --git a/clippy_lints/src/entry.rs b/clippy_lints/src/entry.rs index 7a91dd53c2f5..d32e78798afe 100644 --- a/clippy_lints/src/entry.rs +++ b/clippy_lints/src/entry.rs @@ -2,13 +2,12 @@ use crate::utils::SpanlessEq; use crate::utils::{get_item_name, higher, match_type, paths, snippet, snippet_opt}; use crate::utils::{snippet_with_applicability, span_lint_and_then, walk_ptrs_ty}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/enum_clike.rs b/clippy_lints/src/enum_clike.rs index e3f862dc2a37..52ac1ff71250 100644 --- a/clippy_lints/src/enum_clike.rs +++ b/clippy_lints/src/enum_clike.rs @@ -3,12 +3,11 @@ use crate::consts::{miri_to_const, Constant}; use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc::ty::util::IntTypeExt; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::convert::TryFrom; use syntax::ast::{IntTy, UintTy}; diff --git a/clippy_lints/src/enum_glob_use.rs b/clippy_lints/src/enum_glob_use.rs index 6cd3e1c86b47..4ffc73961a8c 100644 --- a/clippy_lints/src/enum_glob_use.rs +++ b/clippy_lints/src/enum_glob_use.rs @@ -1,11 +1,10 @@ //! lint on `use`ing all variants of an enum use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::def::{DefKind, Res}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/enum_variants.rs b/clippy_lints/src/enum_variants.rs index 9db9385d004d..2275a3dc6cbe 100644 --- a/clippy_lints/src/enum_variants.rs +++ b/clippy_lints/src/enum_variants.rs @@ -2,9 +2,8 @@ use crate::utils::{camel_case, is_present_in_source}; use crate::utils::{span_help_and_lint, span_lint}; -use rustc::impl_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, Lint, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass, Lint}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use rustc_span::symbol::Symbol; use syntax::ast::*; diff --git a/clippy_lints/src/eq_op.rs b/clippy_lints/src/eq_op.rs index 232a26790d0e..e40b9de92395 100644 --- a/clippy_lints/src/eq_op.rs +++ b/clippy_lints/src/eq_op.rs @@ -1,9 +1,8 @@ use crate::utils::{implements_trait, is_copy, multispan_sugg, snippet, span_lint, span_lint_and_then, SpanlessEq}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for equal operands to comparison, logical and diff --git a/clippy_lints/src/erasing_op.rs b/clippy_lints/src/erasing_op.rs index 6ff90315a97c..e08e01c1d67e 100644 --- a/clippy_lints/src/erasing_op.rs +++ b/clippy_lints/src/erasing_op.rs @@ -1,7 +1,6 @@ -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use crate::consts::{constant_simple, Constant}; diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs index 899e288b6ef9..376ad3fe627a 100644 --- a/clippy_lints/src/escape.rs +++ b/clippy_lints/src/escape.rs @@ -1,11 +1,10 @@ -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::layout::LayoutOf; use rustc::ty::{self, Ty}; use rustc_hir::intravisit as visit; use rustc_hir::HirIdSet; use rustc_hir::{self, *}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use rustc_typeck::expr_use_visitor::*; diff --git a/clippy_lints/src/eta_reduction.rs b/clippy_lints/src/eta_reduction.rs index 486200fd3715..5ef933845005 100644 --- a/clippy_lints/src/eta_reduction.rs +++ b/clippy_lints/src/eta_reduction.rs @@ -1,11 +1,11 @@ use if_chain::if_chain; use matches::matches; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::{ implements_trait, is_adjusted, iter_input_pats, snippet_opt, span_lint_and_then, type_is_unsafe_function, diff --git a/clippy_lints/src/eval_order_dependence.rs b/clippy_lints/src/eval_order_dependence.rs index 84545ed6967d..8f52f0e3d86d 100644 --- a/clippy_lints/src/eval_order_dependence.rs +++ b/clippy_lints/src/eval_order_dependence.rs @@ -1,12 +1,11 @@ use crate::utils::{get_parent_expr, span_lint, span_note_and_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for a read and a write to the same variable where diff --git a/clippy_lints/src/excessive_precision.rs b/clippy_lints/src/excessive_precision.rs index 8c51538d35be..2b63d5e9088e 100644 --- a/clippy_lints/src/excessive_precision.rs +++ b/clippy_lints/src/excessive_precision.rs @@ -1,12 +1,11 @@ use crate::utils::span_lint_and_sugg; use crate::utils::sugg::format_numeric_literal; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::symbol::Symbol; use std::f32; use std::f64; diff --git a/clippy_lints/src/exit.rs b/clippy_lints/src/exit.rs index 13c44020363b..dc1126d751da 100644 --- a/clippy_lints/src/exit.rs +++ b/clippy_lints/src/exit.rs @@ -1,9 +1,8 @@ use crate::utils::{is_entrypoint_fn, match_def_path, paths, qpath_res, span_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::{Expr, ExprKind, Item, ItemKind, Node}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** `exit()` terminates the program and doesn't provide a diff --git a/clippy_lints/src/explicit_write.rs b/clippy_lints/src/explicit_write.rs index 0a52e252de95..4aefa941dabe 100644 --- a/clippy_lints/src/explicit_write.rs +++ b/clippy_lints/src/explicit_write.rs @@ -1,10 +1,9 @@ use crate::utils::{is_expn_of, match_function_call, paths, span_lint, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::LitKind; declare_clippy_lint! { diff --git a/clippy_lints/src/fallible_impl_from.rs b/clippy_lints/src/fallible_impl_from.rs index 6aafb5e1ef15..40a68a89a380 100644 --- a/clippy_lints/src/fallible_impl_from.rs +++ b/clippy_lints/src/fallible_impl_from.rs @@ -1,12 +1,11 @@ use crate::utils::paths::{BEGIN_PANIC, BEGIN_PANIC_FMT, FROM_TRAIT, OPTION, RESULT}; use crate::utils::{is_expn_of, match_def_path, method_chain_args, span_lint_and_then, walk_ptrs_ty}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self, Ty}; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/format.rs b/clippy_lints/src/format.rs index bd0e1ab29093..36ed7c475ed3 100644 --- a/clippy_lints/src/format.rs +++ b/clippy_lints/src/format.rs @@ -4,11 +4,10 @@ use crate::utils::{ walk_ptrs_ty, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast::LitKind; diff --git a/clippy_lints/src/formatting.rs b/clippy_lints/src/formatting.rs index d31b15cba9e2..3768c5924aaf 100644 --- a/clippy_lints/src/formatting.rs +++ b/clippy_lints/src/formatting.rs @@ -1,8 +1,8 @@ use crate::utils::{differing_macro_contexts, snippet_opt, span_help_and_lint, span_note_and_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc::lint::in_external_macro; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; declare_clippy_lint! { diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs index 65a5e7be830e..2869bd9c4bda 100644 --- a/clippy_lints/src/functions.rs +++ b/clippy_lints/src/functions.rs @@ -5,15 +5,15 @@ use crate::utils::{ }; use matches::matches; use rustc::hir::map::Map; -use rustc::impl_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::{self, Ty}; use rustc_data_structures::fx::FxHashSet; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::intravisit; use rustc_hir::{def::Res, def_id::DefId}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use rustc_target::spec::abi::Abi; use syntax::ast::Attribute; diff --git a/clippy_lints/src/get_last_with_len.rs b/clippy_lints/src/get_last_with_len.rs index c9939bc5d7c4..19dd103247da 100644 --- a/clippy_lints/src/get_last_with_len.rs +++ b/clippy_lints/src/get_last_with_len.rs @@ -2,11 +2,10 @@ use crate::utils::{is_type_diagnostic_item, snippet_with_applicability, span_lint_and_sugg, SpanlessEq}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::{BinOpKind, Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Spanned; use rustc_span::symbol::Symbol; use syntax::ast::LitKind; diff --git a/clippy_lints/src/identity_conversion.rs b/clippy_lints/src/identity_conversion.rs index 54cf499ae3bc..86478f093c9e 100644 --- a/clippy_lints/src/identity_conversion.rs +++ b/clippy_lints/src/identity_conversion.rs @@ -1,11 +1,10 @@ use crate::utils::{ match_def_path, match_trait_method, paths, same_tys, snippet, snippet_with_macro_callsite, span_lint_and_then, }; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; declare_clippy_lint! { /// **What it does:** Checks for always-identical `Into`/`From`/`IntoIter` conversions. diff --git a/clippy_lints/src/identity_op.rs b/clippy_lints/src/identity_op.rs index b6d02ff9e76d..1896751ff6ff 100644 --- a/clippy_lints/src/identity_op.rs +++ b/clippy_lints/src/identity_op.rs @@ -1,8 +1,7 @@ -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use crate::consts::{constant_simple, Constant}; diff --git a/clippy_lints/src/if_not_else.rs b/clippy_lints/src/if_not_else.rs index a266d7c24344..760a00801c6f 100644 --- a/clippy_lints/src/if_not_else.rs +++ b/clippy_lints/src/if_not_else.rs @@ -1,9 +1,9 @@ //! lint on if branches that could be swapped so no `!` operation is necessary //! on the condition -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; -use rustc_session::declare_tool_lint; +use rustc::lint::in_external_macro; +use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; use crate::utils::span_help_and_lint; diff --git a/clippy_lints/src/implicit_return.rs b/clippy_lints/src/implicit_return.rs index ef1e7ea96dcf..b0d80aa0d539 100644 --- a/clippy_lints/src/implicit_return.rs +++ b/clippy_lints/src/implicit_return.rs @@ -4,14 +4,11 @@ use crate::utils::{ snippet_opt, span_lint_and_then, }; use if_chain::if_chain; -use rustc::{ - declare_lint_pass, - lint::{LateContext, LateLintPass, LintArray, LintPass}, -}; use rustc_errors::Applicability; use rustc_hir::intravisit::FnKind; use rustc_hir::{Body, Expr, ExprKind, FnDecl, HirId, MatchSource, StmtKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/indexing_slicing.rs b/clippy_lints/src/indexing_slicing.rs index 9083f5823aad..65fc29a131f4 100644 --- a/clippy_lints/src/indexing_slicing.rs +++ b/clippy_lints/src/indexing_slicing.rs @@ -4,11 +4,10 @@ use crate::consts::{constant, Constant}; use crate::utils; use crate::utils::higher; use crate::utils::higher::Range; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::RangeLimits; declare_clippy_lint! { diff --git a/clippy_lints/src/infallible_destructuring_match.rs b/clippy_lints/src/infallible_destructuring_match.rs index d70b45eaecb8..1d23dd115bc4 100644 --- a/clippy_lints/src/infallible_destructuring_match.rs +++ b/clippy_lints/src/infallible_destructuring_match.rs @@ -1,10 +1,9 @@ use super::utils::{get_arg_name, match_var, remove_blocks, snippet_with_applicability, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for matches being used to destructure a single-variant enum diff --git a/clippy_lints/src/infinite_iter.rs b/clippy_lints/src/infinite_iter.rs index 25c97d5af80e..cee54488df48 100644 --- a/clippy_lints/src/infinite_iter.rs +++ b/clippy_lints/src/infinite_iter.rs @@ -1,7 +1,6 @@ -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::{get_trait_def_id, higher, implements_trait, match_qpath, match_type, paths, span_lint}; diff --git a/clippy_lints/src/inherent_impl.rs b/clippy_lints/src/inherent_impl.rs index c162de3ad8c4..a3a16ced2e86 100644 --- a/clippy_lints/src/inherent_impl.rs +++ b/clippy_lints/src/inherent_impl.rs @@ -1,11 +1,10 @@ //! lint on inherent implementations use crate::utils::{in_macro, span_lint_and_then}; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_data_structures::fx::FxHashMap; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/inherent_to_string.rs b/clippy_lints/src/inherent_to_string.rs index 9d7c3b46fed5..818168f7f1c6 100644 --- a/clippy_lints/src/inherent_to_string.rs +++ b/clippy_lints/src/inherent_to_string.rs @@ -1,8 +1,7 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::{ImplItem, ImplItemKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::{ get_trait_def_id, implements_trait, match_type, paths, return_ty, span_help_and_lint, trait_ref_of_method, diff --git a/clippy_lints/src/inline_fn_without_body.rs b/clippy_lints/src/inline_fn_without_body.rs index 4ffc45703edc..ed9a958f91b6 100644 --- a/clippy_lints/src/inline_fn_without_body.rs +++ b/clippy_lints/src/inline_fn_without_body.rs @@ -2,11 +2,10 @@ use crate::utils::span_lint_and_then; use crate::utils::sugg::DiagnosticBuilderExt; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::{Attribute, Name}; declare_clippy_lint! { diff --git a/clippy_lints/src/int_plus_one.rs b/clippy_lints/src/int_plus_one.rs index d9dd13923604..cb2d62407ce8 100644 --- a/clippy_lints/src/int_plus_one.rs +++ b/clippy_lints/src/int_plus_one.rs @@ -1,9 +1,8 @@ //! lint on blocks unnecessarily using >= with a + 1 or - 1 -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; use crate::utils::{snippet_opt, span_lint_and_then}; diff --git a/clippy_lints/src/integer_division.rs b/clippy_lints/src/integer_division.rs index feb9fac93c9d..e3614ace3d63 100644 --- a/clippy_lints/src/integer_division.rs +++ b/clippy_lints/src/integer_division.rs @@ -1,9 +1,8 @@ use crate::utils::span_help_and_lint; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for division of integers diff --git a/clippy_lints/src/items_after_statements.rs b/clippy_lints/src/items_after_statements.rs index 06ed5e29c85f..6d944ae8c33a 100644 --- a/clippy_lints/src/items_after_statements.rs +++ b/clippy_lints/src/items_after_statements.rs @@ -2,9 +2,8 @@ use crate::utils::span_lint; use matches::matches; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; declare_clippy_lint! { diff --git a/clippy_lints/src/large_enum_variant.rs b/clippy_lints/src/large_enum_variant.rs index f2638d598799..0cd02f21238d 100644 --- a/clippy_lints/src/large_enum_variant.rs +++ b/clippy_lints/src/large_enum_variant.rs @@ -1,12 +1,11 @@ //! lint when there is a large size difference between variants on an enum use crate::utils::{snippet_opt, span_lint_and_then}; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::layout::LayoutOf; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; declare_clippy_lint! { /// **What it does:** Checks for large size differences between variants on diff --git a/clippy_lints/src/large_stack_arrays.rs b/clippy_lints/src/large_stack_arrays.rs index eef583a6e625..18ddb714dbff 100644 --- a/clippy_lints/src/large_stack_arrays.rs +++ b/clippy_lints/src/large_stack_arrays.rs @@ -1,9 +1,8 @@ -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::mir::interpret::ConstValue; use rustc::ty::{self, ConstKind}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use if_chain::if_chain; diff --git a/clippy_lints/src/len_zero.rs b/clippy_lints/src/len_zero.rs index 653e82a23388..3a07ec183b44 100644 --- a/clippy_lints/src/len_zero.rs +++ b/clippy_lints/src/len_zero.rs @@ -1,12 +1,11 @@ use crate::utils::{get_item_name, snippet_with_applicability, span_lint, span_lint_and_sugg, walk_ptrs_ty}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_data_structures::fx::FxHashSet; use rustc_errors::Applicability; use rustc_hir::def_id::DefId; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::{Span, Spanned}; use syntax::ast::{LitKind, Name}; diff --git a/clippy_lints/src/let_if_seq.rs b/clippy_lints/src/let_if_seq.rs index 2b430f71f225..a4c5c003b7f8 100644 --- a/clippy_lints/src/let_if_seq.rs +++ b/clippy_lints/src/let_if_seq.rs @@ -1,14 +1,13 @@ use crate::utils::{higher, qpath_res, snippet, span_lint_and_then}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::def::Res; use rustc_hir::intravisit; use rustc_hir::BindingAnnotation; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for variable declarations immediately followed by a diff --git a/clippy_lints/src/let_underscore.rs b/clippy_lints/src/let_underscore.rs index 7787a55a2bb6..25828ffce532 100644 --- a/clippy_lints/src/let_underscore.rs +++ b/clippy_lints/src/let_underscore.rs @@ -1,8 +1,7 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::{is_must_use_func_call, is_must_use_ty, span_help_and_lint}; diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 1a112c0d3709..45fcf624b4bf 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -32,6 +32,8 @@ extern crate rustc_index; #[allow(unused_extern_crates)] extern crate rustc_lexer; #[allow(unused_extern_crates)] +extern crate rustc_lint; +#[allow(unused_extern_crates)] extern crate rustc_mir; #[allow(unused_extern_crates)] extern crate rustc_parse; @@ -46,9 +48,9 @@ extern crate rustc_typeck; #[allow(unused_extern_crates)] extern crate syntax; -use rustc::lint::{self, LintId}; use rustc::session::Session; use rustc_data_structures::fx::FxHashSet; +use rustc_lint::LintId; use std::path::Path; @@ -322,7 +324,7 @@ mod reexport { /// level (i.e `#![cfg_attr(...)]`) will still be expanded even when using a pre-expansion pass. /// /// Used in `./src/driver.rs`. -pub fn register_pre_expansion_lints(store: &mut rustc::lint::LintStore, conf: &Conf) { +pub fn register_pre_expansion_lints(store: &mut rustc_lint::LintStore, conf: &Conf) { store.register_pre_expansion_pass(|| box write::Write); store.register_pre_expansion_pass(|| box redundant_field_names::RedundantFieldNames); let single_char_binding_names_threshold = conf.single_char_binding_names_threshold; @@ -392,7 +394,7 @@ pub fn read_conf(args: &[syntax::ast::NestedMetaItem], sess: &Session) -> Conf { /// Used in `./src/driver.rs`. #[allow(clippy::too_many_lines)] #[rustfmt::skip] -pub fn register_plugins(store: &mut lint::LintStore, sess: &Session, conf: &Conf) { +pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: &Conf) { register_removed_non_tool_lints(store); // begin deprecated lints, do not remove this comment, it’s used in `update_lints` @@ -1622,7 +1624,7 @@ pub fn register_plugins(store: &mut lint::LintStore, sess: &Session, conf: &Conf } #[rustfmt::skip] -fn register_removed_non_tool_lints(store: &mut rustc::lint::LintStore) { +fn register_removed_non_tool_lints(store: &mut rustc_lint::LintStore) { store.register_removed( "should_assert_eq", "`assert!()` will be more flexible with RFC 2011", @@ -1672,7 +1674,7 @@ fn register_removed_non_tool_lints(store: &mut rustc::lint::LintStore) { /// Register renamed lints. /// /// Used in `./src/driver.rs`. -pub fn register_renamed(ls: &mut rustc::lint::LintStore) { +pub fn register_renamed(ls: &mut rustc_lint::LintStore) { ls.register_renamed("clippy::stutter", "clippy::module_name_repetitions"); ls.register_renamed("clippy::new_without_default_derive", "clippy::new_without_default"); ls.register_renamed("clippy::cyclomatic_complexity", "clippy::cognitive_complexity"); diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs index 83f9cf9eac5f..13484ba0fa76 100644 --- a/clippy_lints/src/lifetimes.rs +++ b/clippy_lints/src/lifetimes.rs @@ -1,13 +1,13 @@ use matches::matches; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_hir::def::{DefKind, Res}; use rustc_hir::intravisit::*; use rustc_hir::FunctionRetTy::Return; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use rustc_span::symbol::kw; diff --git a/clippy_lints/src/literal_representation.rs b/clippy_lints/src/literal_representation.rs index 95d13ae05ebf..27cb7d219578 100644 --- a/clippy_lints/src/literal_representation.rs +++ b/clippy_lints/src/literal_representation.rs @@ -3,10 +3,10 @@ use crate::utils::{in_macro, snippet_opt, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; -use rustc::{declare_lint_pass, impl_lint_pass}; +use rustc::lint::in_external_macro; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint, impl_lint_pass}; use syntax::ast::*; declare_clippy_lint! { diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index 1c7407eebc68..239d453a9f85 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -1,14 +1,14 @@ use crate::reexport::*; use if_chain::if_chain; use itertools::Itertools; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::middle::region; use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id; use rustc_hir::intravisit::{walk_block, walk_expr, walk_pat, walk_stmt, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; // use rustc::middle::region::CodeExtent; use crate::consts::{constant, Constant}; use crate::utils::usage::mutated_variables; diff --git a/clippy_lints/src/main_recursion.rs b/clippy_lints/src/main_recursion.rs index 31b2dbf2ae4b..3a7bd2fb3a28 100644 --- a/clippy_lints/src/main_recursion.rs +++ b/clippy_lints/src/main_recursion.rs @@ -1,7 +1,6 @@ -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::{Crate, Expr, ExprKind, QPath}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::symbol::sym; use syntax::ast::AttrKind; diff --git a/clippy_lints/src/map_clone.rs b/clippy_lints/src/map_clone.rs index ae2d08301285..f96fb00acd04 100644 --- a/clippy_lints/src/map_clone.rs +++ b/clippy_lints/src/map_clone.rs @@ -3,12 +3,11 @@ use crate::utils::{ is_copy, match_trait_method, match_type, remove_blocks, snippet_with_applicability, span_lint_and_sugg, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast::Ident; diff --git a/clippy_lints/src/map_unit_fn.rs b/clippy_lints/src/map_unit_fn.rs index 3855b5a21f99..8bc08c342dc9 100644 --- a/clippy_lints/src/map_unit_fn.rs +++ b/clippy_lints/src/map_unit_fn.rs @@ -1,12 +1,11 @@ use crate::utils::paths; use crate::utils::{iter_input_pats, match_type, method_chain_args, snippet, span_lint_and_then}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/matches.rs b/clippy_lints/src/matches.rs index 6b5b4e4c4f0b..c386b0c08b86 100644 --- a/clippy_lints/src/matches.rs +++ b/clippy_lints/src/matches.rs @@ -1,4 +1,4 @@ -use crate::consts::{constant, Constant}; +use crate::consts::{constant, miri_to_const, Constant}; use crate::utils::paths; use crate::utils::sugg::Sugg; use crate::utils::{ @@ -7,13 +7,13 @@ use crate::utils::{ walk_ptrs_ty, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir::def::CtorKind; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use std::cmp::Ordering; use std::collections::Bound; @@ -444,7 +444,7 @@ fn check_match_bool(cx: &LateContext<'_, '_>, ex: &Expr<'_>, arms: &[Arm<'_>], e fn check_overlapping_arms<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ex: &'tcx Expr<'_>, arms: &'tcx [Arm<'_>]) { if arms.len() >= 2 && cx.tables.expr_ty(ex).is_integral() { - let ranges = all_ranges(cx, arms); + let ranges = all_ranges(cx, arms, cx.tables.expr_ty(ex)); let type_ranges = type_ranges(&ranges); if !type_ranges.is_empty() { if let Some((start, end)) = overlapping(&type_ranges) { @@ -705,17 +705,27 @@ fn check_wild_in_or_pats(cx: &LateContext<'_, '_>, arms: &[Arm<'_>]) { } /// Gets all arms that are unbounded `PatRange`s. -fn all_ranges<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, arms: &'tcx [Arm<'_>]) -> Vec> { +fn all_ranges<'a, 'tcx>( + cx: &LateContext<'a, 'tcx>, + arms: &'tcx [Arm<'_>], + ty: Ty<'tcx>, +) -> Vec> { arms.iter() .flat_map(|arm| { if let Arm { ref pat, guard: None, .. } = *arm { - if let PatKind::Range(ref lhs, ref rhs, ref range_end) = pat.kind { - let lhs = constant(cx, cx.tables, lhs)?.0; - let rhs = constant(cx, cx.tables, rhs)?.0; - let rhs = match *range_end { + if let PatKind::Range(ref lhs, ref rhs, range_end) = pat.kind { + let lhs = match lhs { + Some(lhs) => constant(cx, cx.tables, lhs)?.0, + None => miri_to_const(ty.numeric_min_val(cx.tcx)?)?, + }; + let rhs = match rhs { + Some(rhs) => constant(cx, cx.tables, rhs)?.0, + None => miri_to_const(ty.numeric_max_val(cx.tcx)?)?, + }; + let rhs = match range_end { RangeEnd::Included => Bound::Included(rhs), RangeEnd::Excluded => Bound::Excluded(rhs), }; diff --git a/clippy_lints/src/mem_discriminant.rs b/clippy_lints/src/mem_discriminant.rs index 636c0f975789..0677233b9e6f 100644 --- a/clippy_lints/src/mem_discriminant.rs +++ b/clippy_lints/src/mem_discriminant.rs @@ -1,10 +1,9 @@ use crate::utils::{match_def_path, paths, snippet, span_lint_and_then, walk_ptrs_ty_depth}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::{BorrowKind, Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::iter; diff --git a/clippy_lints/src/mem_forget.rs b/clippy_lints/src/mem_forget.rs index 4172ea33950c..c6ddc5de63b0 100644 --- a/clippy_lints/src/mem_forget.rs +++ b/clippy_lints/src/mem_forget.rs @@ -1,8 +1,7 @@ use crate::utils::{match_def_path, paths, qpath_res, span_lint}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::{Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for usage of `std::mem::forget(t)` where `t` is diff --git a/clippy_lints/src/mem_replace.rs b/clippy_lints/src/mem_replace.rs index e6b50e546ad0..3ae5863d6991 100644 --- a/clippy_lints/src/mem_replace.rs +++ b/clippy_lints/src/mem_replace.rs @@ -3,11 +3,11 @@ use crate::utils::{ span_lint_and_sugg, span_lint_and_then, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass}; +use rustc::lint::in_external_macro; use rustc_errors::Applicability; use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability, QPath}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/methods/inefficient_to_string.rs b/clippy_lints/src/methods/inefficient_to_string.rs index 83c63ec752f9..1079fbf63ead 100644 --- a/clippy_lints/src/methods/inefficient_to_string.rs +++ b/clippy_lints/src/methods/inefficient_to_string.rs @@ -1,10 +1,10 @@ use super::INEFFICIENT_TO_STRING; use crate::utils::{match_def_path, paths, snippet_with_applicability, span_lint_and_then, walk_ptrs_ty_depth}; use if_chain::if_chain; -use rustc::lint::LateContext; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir as hir; +use rustc_lint::LateContext; /// Checks for the `INEFFICIENT_TO_STRING` lint pub fn lint<'tcx>(cx: &LateContext<'_, 'tcx>, expr: &hir::Expr<'_>, arg: &hir::Expr<'_>, arg_ty: Ty<'tcx>) { diff --git a/clippy_lints/src/methods/manual_saturating_arithmetic.rs b/clippy_lints/src/methods/manual_saturating_arithmetic.rs index 7f2152e294a7..4e3c95f9f739 100644 --- a/clippy_lints/src/methods/manual_saturating_arithmetic.rs +++ b/clippy_lints/src/methods/manual_saturating_arithmetic.rs @@ -1,8 +1,8 @@ use crate::utils::{match_qpath, snippet_with_applicability, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::lint::LateContext; use rustc_errors::Applicability; use rustc_hir as hir; +use rustc_lint::LateContext; use rustc_target::abi::LayoutOf; use syntax::ast; diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index 3f621cb8b287..5fd3c9bb9e00 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -9,14 +9,14 @@ use std::iter; use if_chain::if_chain; use matches::matches; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, Lint, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::{self, Predicate, Ty}; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::intravisit::{self, Visitor}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, Lint, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use rustc_span::symbol::{sym, Symbol, SymbolStr}; use syntax::ast; diff --git a/clippy_lints/src/methods/option_map_unwrap_or.rs b/clippy_lints/src/methods/option_map_unwrap_or.rs index 6381c32d395d..80a937aadb06 100644 --- a/clippy_lints/src/methods/option_map_unwrap_or.rs +++ b/clippy_lints/src/methods/option_map_unwrap_or.rs @@ -1,11 +1,11 @@ use crate::utils::{differing_macro_contexts, paths, snippet_with_applicability, span_lint_and_then}; use crate::utils::{is_copy, match_type}; use rustc::hir::map::Map; -use rustc::lint::LateContext; use rustc_data_structures::fx::FxHashSet; use rustc_errors::Applicability; use rustc_hir::intravisit::{walk_path, NestedVisitorMap, Visitor}; use rustc_hir::{self, *}; +use rustc_lint::LateContext; use rustc_span::source_map::Span; use rustc_span::symbol::Symbol; diff --git a/clippy_lints/src/methods/unnecessary_filter_map.rs b/clippy_lints/src/methods/unnecessary_filter_map.rs index 62b30baef18a..fdfae8cd190c 100644 --- a/clippy_lints/src/methods/unnecessary_filter_map.rs +++ b/clippy_lints/src/methods/unnecessary_filter_map.rs @@ -2,10 +2,10 @@ use crate::utils::paths; use crate::utils::usage::mutated_variables; use crate::utils::{match_qpath, match_trait_method, span_lint}; use rustc::hir::map::Map; -use rustc::lint::LateContext; use rustc_hir as hir; use rustc_hir::def::Res; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; +use rustc_lint::LateContext; use if_chain::if_chain; diff --git a/clippy_lints/src/minmax.rs b/clippy_lints/src/minmax.rs index 749f6b925151..b3431c053783 100644 --- a/clippy_lints/src/minmax.rs +++ b/clippy_lints/src/minmax.rs @@ -1,9 +1,8 @@ use crate::consts::{constant_simple, Constant}; use crate::utils::{match_def_path, paths, span_lint}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::cmp::Ordering; declare_clippy_lint! { diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs index 2195b486fd9c..583bdd43df83 100644 --- a/clippy_lints/src/misc.rs +++ b/clippy_lints/src/misc.rs @@ -1,12 +1,11 @@ use if_chain::if_chain; use matches::matches; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir::intravisit::FnKind; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::{ExpnKind, Span}; use syntax::ast::LitKind; diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs index 376d0593faef..12b5d4aa1224 100644 --- a/clippy_lints/src/misc_early.rs +++ b/clippy_lints/src/misc_early.rs @@ -3,11 +3,11 @@ use crate::utils::{ span_lint_and_then, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_data_structures::fx::FxHashMap; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast::*; use syntax::visit::{walk_expr, FnKind, Visitor}; diff --git a/clippy_lints/src/missing_const_for_fn.rs b/clippy_lints/src/missing_const_for_fn.rs index de734ccb6774..dc5a58abe56d 100644 --- a/clippy_lints/src/missing_const_for_fn.rs +++ b/clippy_lints/src/missing_const_for_fn.rs @@ -1,11 +1,11 @@ use crate::utils::{has_drop, is_entrypoint_fn, span_lint, trait_ref_of_method}; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass}; +use rustc::lint::in_external_macro; use rustc_hir as hir; use rustc_hir::intravisit::FnKind; use rustc_hir::{Body, Constness, FnDecl, HirId}; +use rustc_lint::{LateContext, LateLintPass}; use rustc_mir::transform::qualify_min_const_fn::is_min_const_fn; -use rustc_session::declare_tool_lint; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::Span; use rustc_typeck::hir_ty_to_ty; diff --git a/clippy_lints/src/missing_doc.rs b/clippy_lints/src/missing_doc.rs index e736e13deed8..4e6989f7076c 100644 --- a/clippy_lints/src/missing_doc.rs +++ b/clippy_lints/src/missing_doc.rs @@ -7,11 +7,10 @@ use crate::utils::span_lint; use if_chain::if_chain; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass}; use rustc::ty; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use syntax::ast::{self, MetaItem, MetaItemKind}; use syntax::attr; diff --git a/clippy_lints/src/missing_inline.rs b/clippy_lints/src/missing_inline.rs index c25131c520cb..562259ffc01a 100644 --- a/clippy_lints/src/missing_inline.rs +++ b/clippy_lints/src/missing_inline.rs @@ -1,8 +1,7 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{self, LateContext, LateLintPass, LintArray, LintContext, LintPass}; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{self, LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast; @@ -82,7 +81,7 @@ declare_lint_pass!(MissingInline => [MISSING_INLINE_IN_PUBLIC_ITEMS]); impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline { fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, it: &'tcx hir::Item<'_>) { - if lint::in_external_macro(cx.sess(), it.span) || is_executable(cx) { + if rustc::lint::in_external_macro(cx.sess(), it.span) || is_executable(cx) { return; } @@ -132,7 +131,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline { fn check_impl_item(&mut self, cx: &LateContext<'a, 'tcx>, impl_item: &'tcx hir::ImplItem<'_>) { use rustc::ty::{ImplContainer, TraitContainer}; - if lint::in_external_macro(cx.sess(), impl_item.span) || is_executable(cx) { + if rustc::lint::in_external_macro(cx.sess(), impl_item.span) || is_executable(cx) { return; } diff --git a/clippy_lints/src/modulo_arithmetic.rs b/clippy_lints/src/modulo_arithmetic.rs index 82631257da8b..238863e8c67b 100644 --- a/clippy_lints/src/modulo_arithmetic.rs +++ b/clippy_lints/src/modulo_arithmetic.rs @@ -1,11 +1,10 @@ use crate::consts::{constant, Constant}; use crate::utils::{sext, span_lint_and_then}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::fmt::Display; declare_clippy_lint! { diff --git a/clippy_lints/src/mul_add.rs b/clippy_lints/src/mul_add.rs index 27f598c141e1..5de936634991 100644 --- a/clippy_lints/src/mul_add.rs +++ b/clippy_lints/src/mul_add.rs @@ -1,8 +1,7 @@ -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::*; diff --git a/clippy_lints/src/multiple_crate_versions.rs b/clippy_lints/src/multiple_crate_versions.rs index 4965352e49ee..0b9e46978c88 100644 --- a/clippy_lints/src/multiple_crate_versions.rs +++ b/clippy_lints/src/multiple_crate_versions.rs @@ -1,9 +1,8 @@ //! lint on multiple versions of a crate being used use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::DUMMY_SP; use syntax::ast::*; diff --git a/clippy_lints/src/mut_key.rs b/clippy_lints/src/mut_key.rs index a64467ef6a24..8a79786d4fc6 100644 --- a/clippy_lints/src/mut_key.rs +++ b/clippy_lints/src/mut_key.rs @@ -1,9 +1,8 @@ use crate::utils::{match_def_path, paths, span_lint, trait_ref_of_method, walk_ptrs_ty}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{Adt, Dynamic, Opaque, Param, RawPtr, Ref, Ty, TypeAndMut}; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/mut_mut.rs b/clippy_lints/src/mut_mut.rs index 5cc599368521..988484591660 100644 --- a/clippy_lints/src/mut_mut.rs +++ b/clippy_lints/src/mut_mut.rs @@ -1,11 +1,11 @@ use crate::utils::{higher, span_lint}; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty; use rustc_hir as hir; use rustc_hir::intravisit; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for instances of `mut mut` references. diff --git a/clippy_lints/src/mut_reference.rs b/clippy_lints/src/mut_reference.rs index 165b3a7c7e68..2d70b65bb1ee 100644 --- a/clippy_lints/src/mut_reference.rs +++ b/clippy_lints/src/mut_reference.rs @@ -1,10 +1,9 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::subst::Subst; use rustc::ty::{self, Ty}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Detects giving a mutable reference to a function that only diff --git a/clippy_lints/src/mutable_debug_assertion.rs b/clippy_lints/src/mutable_debug_assertion.rs index 0918886a9793..71a93071e530 100644 --- a/clippy_lints/src/mutable_debug_assertion.rs +++ b/clippy_lints/src/mutable_debug_assertion.rs @@ -2,11 +2,11 @@ use crate::utils::{is_direct_expn_of, span_lint}; use if_chain::if_chain; use matches::matches; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; -use rustc::{declare_lint_pass, ty}; +use rustc::ty; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability, StmtKind, UnOp}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/mutex_atomic.rs b/clippy_lints/src/mutex_atomic.rs index e04bd56e054f..98cb9126f8ba 100644 --- a/clippy_lints/src/mutex_atomic.rs +++ b/clippy_lints/src/mutex_atomic.rs @@ -3,11 +3,10 @@ //! This lint is **warn** by default use crate::utils::{match_type, paths, span_lint}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self, Ty}; use rustc_hir::Expr; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast; declare_clippy_lint! { diff --git a/clippy_lints/src/needless_bool.rs b/clippy_lints/src/needless_bool.rs index 78c121b6dd8a..db4012146dff 100644 --- a/clippy_lints/src/needless_bool.rs +++ b/clippy_lints/src/needless_bool.rs @@ -4,11 +4,10 @@ use crate::utils::sugg::Sugg; use crate::utils::{higher, parent_node_is_if_expr, span_lint, span_lint_and_sugg}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Spanned; use syntax::ast::LitKind; diff --git a/clippy_lints/src/needless_borrow.rs b/clippy_lints/src/needless_borrow.rs index 985501472740..dc37c7804fee 100644 --- a/clippy_lints/src/needless_borrow.rs +++ b/clippy_lints/src/needless_borrow.rs @@ -4,13 +4,12 @@ use crate::utils::{snippet_opt, span_lint_and_then}; use if_chain::if_chain; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc::ty::adjustment::{Adjust, Adjustment}; use rustc_errors::Applicability; use rustc_hir::{BindingAnnotation, BorrowKind, Expr, ExprKind, HirId, Item, Mutability, Pat, PatKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; declare_clippy_lint! { /// **What it does:** Checks for address of operations (`&`) that are going to diff --git a/clippy_lints/src/needless_borrowed_ref.rs b/clippy_lints/src/needless_borrowed_ref.rs index f05b47cf926c..1f04fe7c8a08 100644 --- a/clippy_lints/src/needless_borrowed_ref.rs +++ b/clippy_lints/src/needless_borrowed_ref.rs @@ -4,11 +4,10 @@ use crate::utils::{snippet_with_applicability, span_lint_and_then}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::{BindingAnnotation, Mutability, Node, Pat, PatKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for useless borrowed references. diff --git a/clippy_lints/src/needless_continue.rs b/clippy_lints/src/needless_continue.rs index f35b84c449b2..7bf667f4bc6f 100644 --- a/clippy_lints/src/needless_continue.rs +++ b/clippy_lints/src/needless_continue.rs @@ -33,9 +33,8 @@ //! ``` //! //! This lint is **warn** by default. -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::{original_sp, DUMMY_SP}; use std::borrow::Cow; use syntax::ast; diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs index 12be861a9ff3..ad4fec1272d0 100644 --- a/clippy_lints/src/needless_pass_by_value.rs +++ b/clippy_lints/src/needless_pass_by_value.rs @@ -5,22 +5,20 @@ use crate::utils::{ }; use if_chain::if_chain; use matches::matches; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::traits; use rustc::traits::misc::can_type_implement_copy; use rustc::ty::{self, RegionKind, TypeFoldable}; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; -use rustc_errors::Applicability; +use rustc_errors::{Applicability, DiagnosticBuilder}; use rustc_hir::intravisit::FnKind; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::{Span, Symbol}; use rustc_target::spec::abi::Abi; use rustc_typeck::expr_use_visitor as euv; use std::borrow::Cow; use syntax::ast::Attribute; -use syntax::errors::DiagnosticBuilder; declare_clippy_lint! { /// **What it does:** Checks for functions taking arguments by value, but not diff --git a/clippy_lints/src/needless_update.rs b/clippy_lints/src/needless_update.rs index f122948893f5..e52b1cbf453c 100644 --- a/clippy_lints/src/needless_update.rs +++ b/clippy_lints/src/needless_update.rs @@ -1,9 +1,8 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_hir::{Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for needlessly including a base struct on update diff --git a/clippy_lints/src/neg_cmp_op_on_partial_ord.rs b/clippy_lints/src/neg_cmp_op_on_partial_ord.rs index 1a556fff23f4..efe5f26c4239 100644 --- a/clippy_lints/src/neg_cmp_op_on_partial_ord.rs +++ b/clippy_lints/src/neg_cmp_op_on_partial_ord.rs @@ -1,8 +1,8 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::{self, paths, span_lint}; diff --git a/clippy_lints/src/neg_multiply.rs b/clippy_lints/src/neg_multiply.rs index 6e77a7a77fa0..bd4ada23762b 100644 --- a/clippy_lints/src/neg_multiply.rs +++ b/clippy_lints/src/neg_multiply.rs @@ -1,8 +1,7 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use crate::consts::{self, Constant}; diff --git a/clippy_lints/src/new_without_default.rs b/clippy_lints/src/new_without_default.rs index 84aaa90428df..029a8c4d3152 100644 --- a/clippy_lints/src/new_without_default.rs +++ b/clippy_lints/src/new_without_default.rs @@ -2,14 +2,14 @@ use crate::utils::paths; use crate::utils::sugg::DiagnosticBuilderExt; use crate::utils::{get_trait_def_id, implements_trait, return_ty, same_tys, span_lint_hir_and_then}; use if_chain::if_chain; -use rustc::impl_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::def_id::DefId; use rustc_hir::HirIdSet; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/no_effect.rs b/clippy_lints/src/no_effect.rs index 6a00d253c956..6383d3ca2454 100644 --- a/clippy_lints/src/no_effect.rs +++ b/clippy_lints/src/no_effect.rs @@ -1,10 +1,9 @@ use crate::utils::{has_drop, qpath_res, snippet_opt, span_lint, span_lint_and_sugg}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::def::{DefKind, Res}; use rustc_hir::{BinOpKind, BlockCheckMode, Expr, ExprKind, Stmt, StmtKind, UnsafeSource}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::ops::Deref; declare_clippy_lint! { diff --git a/clippy_lints/src/non_copy_const.rs b/clippy_lints/src/non_copy_const.rs index 6ffad405c2a2..d977bb1529e2 100644 --- a/clippy_lints/src/non_copy_const.rs +++ b/clippy_lints/src/non_copy_const.rs @@ -4,13 +4,12 @@ use std::ptr; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, Lint, LintArray, LintPass}; use rustc::ty::adjustment::Adjust; use rustc::ty::{Ty, TypeFlags}; use rustc_hir::def::{DefKind, Res}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, Lint}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::{InnerSpan, Span, DUMMY_SP}; use rustc_typeck::hir_ty_to_ty; diff --git a/clippy_lints/src/non_expressive_names.rs b/clippy_lints/src/non_expressive_names.rs index 03d0a9a6a563..b9df82d65e3b 100644 --- a/clippy_lints/src/non_expressive_names.rs +++ b/clippy_lints/src/non_expressive_names.rs @@ -1,7 +1,6 @@ use crate::utils::{span_lint, span_lint_and_then}; -use rustc::impl_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::Span; use rustc_span::symbol::SymbolStr; use std::cmp::Ordering; diff --git a/clippy_lints/src/ok_if_let.rs b/clippy_lints/src/ok_if_let.rs index 083f0ee2168d..6145fae31562 100644 --- a/clippy_lints/src/ok_if_let.rs +++ b/clippy_lints/src/ok_if_let.rs @@ -1,9 +1,8 @@ use crate::utils::{match_type, method_chain_args, paths, snippet, span_help_and_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:*** Checks for unnecessary `ok()` in if let. diff --git a/clippy_lints/src/open_options.rs b/clippy_lints/src/open_options.rs index f41ac30c4815..ff0cb53509d9 100644 --- a/clippy_lints/src/open_options.rs +++ b/clippy_lints/src/open_options.rs @@ -1,8 +1,7 @@ use crate::utils::{match_type, paths, span_lint, walk_ptrs_ty}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::{Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::{Span, Spanned}; use syntax::ast::LitKind; diff --git a/clippy_lints/src/overflow_check_conditional.rs b/clippy_lints/src/overflow_check_conditional.rs index 453ebb1c6e19..df3f588f38a1 100644 --- a/clippy_lints/src/overflow_check_conditional.rs +++ b/clippy_lints/src/overflow_check_conditional.rs @@ -1,9 +1,8 @@ use crate::utils::{span_lint, SpanlessEq}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Detects classic underflow/overflow checks. diff --git a/clippy_lints/src/panic_unimplemented.rs b/clippy_lints/src/panic_unimplemented.rs index 8677be559183..b26ad1a5b45d 100644 --- a/clippy_lints/src/panic_unimplemented.rs +++ b/clippy_lints/src/panic_unimplemented.rs @@ -1,9 +1,8 @@ use crate::utils::{is_direct_expn_of, is_expn_of, match_function_call, paths, span_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::Span; use syntax::ast::LitKind; diff --git a/clippy_lints/src/partialeq_ne_impl.rs b/clippy_lints/src/partialeq_ne_impl.rs index 7522b96e1cde..b5ccfad8186d 100644 --- a/clippy_lints/src/partialeq_ne_impl.rs +++ b/clippy_lints/src/partialeq_ne_impl.rs @@ -1,9 +1,8 @@ use crate::utils::{is_automatically_derived, span_lint_hir}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for manual re-implementations of `PartialEq::ne`. diff --git a/clippy_lints/src/path_buf_push_overwrite.rs b/clippy_lints/src/path_buf_push_overwrite.rs index 2ae67d2e995f..adaf8bb77a20 100644 --- a/clippy_lints/src/path_buf_push_overwrite.rs +++ b/clippy_lints/src/path_buf_push_overwrite.rs @@ -1,10 +1,9 @@ use crate::utils::{match_type, paths, span_lint_and_sugg, walk_ptrs_ty}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::path::{Component, Path}; use syntax::ast::LitKind; diff --git a/clippy_lints/src/precedence.rs b/clippy_lints/src/precedence.rs index 37901a0b1b46..27e67bbe718c 100644 --- a/clippy_lints/src/precedence.rs +++ b/clippy_lints/src/precedence.rs @@ -1,8 +1,7 @@ use crate::utils::{snippet_with_applicability, span_lint_and_sugg}; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Spanned; use syntax::ast::*; diff --git a/clippy_lints/src/ptr.rs b/clippy_lints/src/ptr.rs index 907a46846d07..08a9824b8232 100644 --- a/clippy_lints/src/ptr.rs +++ b/clippy_lints/src/ptr.rs @@ -6,13 +6,12 @@ use crate::utils::{ walk_ptrs_hir_ty, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir::QPath; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use rustc_span::{MultiSpan, Symbol}; use std::borrow::Cow; diff --git a/clippy_lints/src/ptr_offset_with_cast.rs b/clippy_lints/src/ptr_offset_with_cast.rs index 129adbe5fed7..93bd3b57ad7e 100644 --- a/clippy_lints/src/ptr_offset_with_cast.rs +++ b/clippy_lints/src/ptr_offset_with_cast.rs @@ -1,9 +1,8 @@ use crate::utils; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::{Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::fmt; declare_clippy_lint! { diff --git a/clippy_lints/src/question_mark.rs b/clippy_lints/src/question_mark.rs index 12d0197c3a00..46c4746d2f56 100644 --- a/clippy_lints/src/question_mark.rs +++ b/clippy_lints/src/question_mark.rs @@ -1,10 +1,9 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::def::{DefKind, Res}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::paths::*; use crate::utils::sugg::Sugg; diff --git a/clippy_lints/src/ranges.rs b/clippy_lints/src/ranges.rs index a5e61da67401..19f88e770aed 100644 --- a/clippy_lints/src/ranges.rs +++ b/clippy_lints/src/ranges.rs @@ -1,9 +1,8 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Spanned; use syntax::ast::RangeLimits; diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs index c11dfb06a66a..4483d2f21be4 100644 --- a/clippy_lints/src/redundant_clone.rs +++ b/clippy_lints/src/redundant_clone.rs @@ -4,8 +4,6 @@ use crate::utils::{ }; use if_chain::if_chain; use matches::matches; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::mir::{ self, traversal, visit::{MutatingUseContext, PlaceContext, Visitor as _}, @@ -16,10 +14,11 @@ use rustc_errors::Applicability; use rustc_hir::intravisit::FnKind; use rustc_hir::{def_id, Body, FnDecl, HirId}; use rustc_index::bit_set::{BitSet, HybridBitSet}; +use rustc_lint::{LateContext, LateLintPass}; use rustc_mir::dataflow::{ do_dataflow, BitDenotation, BottomValue, DataflowResults, DataflowResultsCursor, DebugFormatted, GenKillSet, }; -use rustc_session::declare_tool_lint; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::{BytePos, Span}; use std::convert::TryFrom; @@ -158,7 +157,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RedundantClone { let pred_arg = if_chain! { if let Some((pred_fn_def_id, pred_arg, pred_arg_ty, Some(res))) = is_call_with_ref_arg(cx, mir, &pred_terminator.kind); - if res.base == mir::PlaceBase::Local(cloned); + if res.local == cloned; if match_def_path(cx, pred_fn_def_id, &paths::DEREF_TRAIT_METHOD); if match_type(cx, pred_arg_ty, &paths::PATH_BUF) || match_type(cx, pred_arg_ty, &paths::OS_STRING); @@ -265,7 +264,7 @@ fn is_call_with_ref_arg<'tcx>( if_chain! { if let mir::TerminatorKind::Call { func, args, destination, .. } = kind; if args.len() == 1; - if let mir::Operand::Move(mir::Place { base: mir::PlaceBase::Local(local), .. }) = &args[0]; + if let mir::Operand::Move(mir::Place { local, .. }) = &args[0]; if let ty::FnDef(def_id, _) = func.ty(&*mir, cx.tcx).kind; if let (inner_ty, 1) = walk_ptrs_ty_depth(args[0].ty(&*mir, cx.tcx)); if !is_copy(cx, inner_ty); @@ -289,14 +288,7 @@ fn find_stmt_assigns_to<'tcx>( bb: mir::BasicBlock, ) -> Option<(mir::Local, CannotMoveOut)> { let rvalue = mir.basic_blocks()[bb].statements.iter().rev().find_map(|stmt| { - if let mir::StatementKind::Assign(box ( - mir::Place { - base: mir::PlaceBase::Local(local), - .. - }, - v, - )) = &stmt.kind - { + if let mir::StatementKind::Assign(box (mir::Place { local, .. }, v)) = &stmt.kind { return if *local == to_local { Some(v) } else { None }; } @@ -305,11 +297,11 @@ fn find_stmt_assigns_to<'tcx>( match (by_ref, &*rvalue) { (true, mir::Rvalue::Ref(_, _, place)) | (false, mir::Rvalue::Use(mir::Operand::Copy(place))) => { - base_local_and_movability(cx, mir, place) + base_local_and_movability(cx, mir, *place) }, (false, mir::Rvalue::Ref(_, _, place)) => { if let [mir::ProjectionElem::Deref] = place.as_ref().projection { - base_local_and_movability(cx, mir, place) + base_local_and_movability(cx, mir, *place) } else { None } @@ -325,7 +317,7 @@ fn find_stmt_assigns_to<'tcx>( fn base_local_and_movability<'tcx>( cx: &LateContext<'_, 'tcx>, mir: &mir::Body<'tcx>, - place: &mir::Place<'tcx>, + place: mir::Place<'tcx>, ) -> Option<(mir::Local, CannotMoveOut)> { use rustc::mir::PlaceRef; @@ -334,25 +326,15 @@ fn base_local_and_movability<'tcx>( // Accessing a field of an ADT that has `Drop`. Moving the field out will cause E0509. let mut field = false; - let PlaceRef { - base: place_base, - mut projection, - } = place.as_ref(); - if let mir::PlaceBase::Local(local) = place_base { - while let [base @ .., elem] = projection { - projection = base; - deref |= matches!(elem, mir::ProjectionElem::Deref); - field |= matches!(elem, mir::ProjectionElem::Field(..)) - && has_drop( - cx, - mir::Place::ty_from(place_base, projection, &mir.local_decls, cx.tcx).ty, - ); - } - - Some((*local, deref || field)) - } else { - None + let PlaceRef { local, mut projection } = place.as_ref(); + while let [base @ .., elem] = projection { + projection = base; + deref |= matches!(elem, mir::ProjectionElem::Deref); + field |= matches!(elem, mir::ProjectionElem::Field(..)) + && has_drop(cx, mir::Place::ty_from(local, projection, &mir.local_decls, cx.tcx).ty); } + + Some((*local, deref || field)) } struct LocalUseVisitor { @@ -503,38 +485,28 @@ impl<'a, 'tcx> PossibleBorrowerVisitor<'a, 'tcx> { impl<'a, 'tcx> mir::visit::Visitor<'tcx> for PossibleBorrowerVisitor<'a, 'tcx> { fn visit_assign(&mut self, place: &mir::Place<'tcx>, rvalue: &mir::Rvalue<'_>, _location: mir::Location) { - if let mir::PlaceBase::Local(lhs) = place.base { - match rvalue { - mir::Rvalue::Ref(_, _, borrowed) => { - if let mir::PlaceBase::Local(borrowed_local) = borrowed.base { - self.possible_borrower.add(borrowed_local, lhs); - } - }, - other => { - if !ContainsRegion.visit_ty(place.ty(&self.body.local_decls, self.cx.tcx).ty) { - return; + let lhs = place.local; + match rvalue { + mir::Rvalue::Ref(_, _, borrowed) => { + self.possible_borrower.add(borrowed.local, lhs); + }, + other => { + if !ContainsRegion.visit_ty(place.ty(&self.body.local_decls, self.cx.tcx).ty) { + return; + } + rvalue_locals(other, |rhs| { + if lhs != rhs { + self.possible_borrower.add(rhs, lhs); } - rvalue_locals(other, |rhs| { - if lhs != rhs { - self.possible_borrower.add(rhs, lhs); - } - }); - }, - } + }); + }, } } fn visit_terminator(&mut self, terminator: &mir::Terminator<'_>, _loc: mir::Location) { if let mir::TerminatorKind::Call { args, - destination: - Some(( - mir::Place { - base: mir::PlaceBase::Local(dest), - .. - }, - _, - )), + destination: Some((mir::Place { local: dest, .. }, _)), .. } = &terminator.kind { @@ -548,9 +520,7 @@ impl<'a, 'tcx> mir::visit::Visitor<'tcx> for PossibleBorrowerVisitor<'a, 'tcx> { for op in args { match op { mir::Operand::Copy(p) | mir::Operand::Move(p) => { - if let mir::PlaceBase::Local(arg) = p.base { - self.possible_borrower.add(arg, *dest); - } + self.possible_borrower.add(p.local, *dest); }, _ => (), } @@ -571,11 +541,7 @@ fn rvalue_locals(rvalue: &mir::Rvalue<'_>, mut visit: impl FnMut(mir::Local)) { use rustc::mir::Rvalue::*; let mut visit_op = |op: &mir::Operand<'_>| match op { - mir::Operand::Copy(p) | mir::Operand::Move(p) => { - if let mir::PlaceBase::Local(l) = p.base { - visit(l) - } - }, + mir::Operand::Copy(p) | mir::Operand::Move(p) => visit(p.local), _ => (), }; diff --git a/clippy_lints/src/redundant_field_names.rs b/clippy_lints/src/redundant_field_names.rs index 46010af1c091..57349715c784 100644 --- a/clippy_lints/src/redundant_field_names.rs +++ b/clippy_lints/src/redundant_field_names.rs @@ -1,8 +1,7 @@ use crate::utils::span_lint_and_sugg; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; declare_clippy_lint! { diff --git a/clippy_lints/src/redundant_pattern_matching.rs b/clippy_lints/src/redundant_pattern_matching.rs index 59e55e583983..f0acd993480b 100644 --- a/clippy_lints/src/redundant_pattern_matching.rs +++ b/clippy_lints/src/redundant_pattern_matching.rs @@ -1,9 +1,8 @@ use crate::utils::{match_qpath, paths, snippet, span_lint_and_then}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::LitKind; declare_clippy_lint! { diff --git a/clippy_lints/src/redundant_static_lifetimes.rs b/clippy_lints/src/redundant_static_lifetimes.rs index 12c530cf221f..9cebe310d5fe 100644 --- a/clippy_lints/src/redundant_static_lifetimes.rs +++ b/clippy_lints/src/redundant_static_lifetimes.rs @@ -1,8 +1,7 @@ use crate::utils::{snippet, span_lint_and_then}; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; declare_clippy_lint! { diff --git a/clippy_lints/src/reference.rs b/clippy_lints/src/reference.rs index 6bb4236b0435..c575ef67f2a9 100644 --- a/clippy_lints/src/reference.rs +++ b/clippy_lints/src/reference.rs @@ -1,9 +1,8 @@ use crate::utils::{in_macro, snippet_with_applicability, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::{Expr, ExprKind, UnOp}; declare_clippy_lint! { diff --git a/clippy_lints/src/regex.rs b/clippy_lints/src/regex.rs index 188ff6d205f7..bd09905a9b7f 100644 --- a/clippy_lints/src/regex.rs +++ b/clippy_lints/src/regex.rs @@ -1,11 +1,10 @@ use crate::consts::{constant, Constant}; use crate::utils::{is_expn_of, match_def_path, match_type, paths, span_help_and_lint, span_lint}; use if_chain::if_chain; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_data_structures::fx::FxHashSet; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::source_map::{BytePos, Span}; use std::convert::TryFrom; use syntax::ast::{LitKind, StrStyle}; diff --git a/clippy_lints/src/replace_consts.rs b/clippy_lints/src/replace_consts.rs index 26ce494245cf..66e1df72b25f 100644 --- a/clippy_lints/src/replace_consts.rs +++ b/clippy_lints/src/replace_consts.rs @@ -1,11 +1,10 @@ use crate::utils::{match_def_path, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::def::{DefKind, Res}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for usage of standard library diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs index ced784ca4917..c903df0f2119 100644 --- a/clippy_lints/src/returns.rs +++ b/clippy_lints/src/returns.rs @@ -1,8 +1,8 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use rustc_span::BytePos; use syntax::ast; diff --git a/clippy_lints/src/serde_api.rs b/clippy_lints/src/serde_api.rs index 68c3cc70d284..3f6ff39613a7 100644 --- a/clippy_lints/src/serde_api.rs +++ b/clippy_lints/src/serde_api.rs @@ -1,8 +1,7 @@ use crate::utils::{get_trait_def_id, paths, span_lint}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for mis-uses of the serde API. diff --git a/clippy_lints/src/shadow.rs b/clippy_lints/src/shadow.rs index 825f9ee3a413..28e3acdf6bea 100644 --- a/clippy_lints/src/shadow.rs +++ b/clippy_lints/src/shadow.rs @@ -1,11 +1,11 @@ use crate::reexport::*; use crate::utils::{contains_name, higher, iter_input_pats, snippet, span_lint_and_then}; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty; use rustc_hir::intravisit::FnKind; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/slow_vector_initialization.rs b/clippy_lints/src/slow_vector_initialization.rs index 512bf21a9f3c..48d0e53d163e 100644 --- a/clippy_lints/src/slow_vector_initialization.rs +++ b/clippy_lints/src/slow_vector_initialization.rs @@ -1,13 +1,12 @@ use crate::utils::sugg::Sugg; use crate::utils::{get_enclosing_block, match_qpath, span_lint_and_then, SpanlessEq}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, Lint, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::intravisit::{walk_block, walk_expr, walk_stmt, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, Lint}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::symbol::Symbol; use syntax::ast::LitKind; diff --git a/clippy_lints/src/strings.rs b/clippy_lints/src/strings.rs index e36dbbbe5f42..ffe7c13ec575 100644 --- a/clippy_lints/src/strings.rs +++ b/clippy_lints/src/strings.rs @@ -1,8 +1,8 @@ -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Spanned; use if_chain::if_chain; diff --git a/clippy_lints/src/suspicious_trait_impl.rs b/clippy_lints/src/suspicious_trait_impl.rs index 7092397619a5..40e1b4abc796 100644 --- a/clippy_lints/src/suspicious_trait_impl.rs +++ b/clippy_lints/src/suspicious_trait_impl.rs @@ -1,11 +1,10 @@ use crate::utils::{get_trait_def_id, span_lint, trait_ref_of_method}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir as hir; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Lints for suspicious operations in impls of arithmetic operators, e.g. diff --git a/clippy_lints/src/swap.rs b/clippy_lints/src/swap.rs index 4b8fcbb63c50..7e699844ef23 100644 --- a/clippy_lints/src/swap.rs +++ b/clippy_lints/src/swap.rs @@ -5,12 +5,11 @@ use crate::utils::{ }; use if_chain::if_chain; use matches::matches; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::Symbol; declare_clippy_lint! { diff --git a/clippy_lints/src/tabs_in_doc_comments.rs b/clippy_lints/src/tabs_in_doc_comments.rs index 9d211b7b9351..41e3f9918cc9 100644 --- a/clippy_lints/src/tabs_in_doc_comments.rs +++ b/clippy_lints/src/tabs_in_doc_comments.rs @@ -1,8 +1,7 @@ use crate::utils::span_lint_and_sugg; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::{BytePos, Span}; use std::convert::TryFrom; use syntax::ast; diff --git a/clippy_lints/src/temporary_assignment.rs b/clippy_lints/src/temporary_assignment.rs index b5419c80341e..fec9ad256336 100644 --- a/clippy_lints/src/temporary_assignment.rs +++ b/clippy_lints/src/temporary_assignment.rs @@ -1,10 +1,9 @@ use crate::utils::is_adjusted; use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::def::{DefKind, Res}; use rustc_hir::{Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for construction of a structure or tuple just to diff --git a/clippy_lints/src/to_digit_is_some.rs b/clippy_lints/src/to_digit_is_some.rs index 3d5f3347eda2..5ec4a82b12e9 100644 --- a/clippy_lints/src/to_digit_is_some.rs +++ b/clippy_lints/src/to_digit_is_some.rs @@ -1,11 +1,10 @@ use crate::utils::{match_def_path, snippet_with_applicability, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; use rustc_errors::Applicability; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for `.to_digit(..).is_some()` on `char`s. diff --git a/clippy_lints/src/trait_bounds.rs b/clippy_lints/src/trait_bounds.rs index 476517362a1e..4c46ebd703c9 100644 --- a/clippy_lints/src/trait_bounds.rs +++ b/clippy_lints/src/trait_bounds.rs @@ -1,9 +1,8 @@ use crate::utils::{in_macro, snippet, span_help_and_lint, SpanlessHash}; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_data_structures::fx::FxHashMap; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; #[derive(Copy, Clone)] pub struct TraitBounds; diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs index 30ea81125c52..e6a9aa3c9a63 100644 --- a/clippy_lints/src/transmute.rs +++ b/clippy_lints/src/transmute.rs @@ -2,12 +2,11 @@ use crate::utils::{ is_normalizable, last_path_segment, match_def_path, paths, snippet, span_lint, span_lint_and_then, sugg, }; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use std::borrow::Cow; use syntax::ast; diff --git a/clippy_lints/src/transmuting_null.rs b/clippy_lints/src/transmuting_null.rs index 3ecd45b580db..dcab84122505 100644 --- a/clippy_lints/src/transmuting_null.rs +++ b/clippy_lints/src/transmuting_null.rs @@ -1,10 +1,10 @@ use crate::consts::{constant_context, Constant}; use crate::utils::{match_qpath, paths, span_lint}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc_hir::{Expr, ExprKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::LitKind; declare_clippy_lint! { diff --git a/clippy_lints/src/trivially_copy_pass_by_ref.rs b/clippy_lints/src/trivially_copy_pass_by_ref.rs index f8a6a2acd8a6..ac31757d17d5 100644 --- a/clippy_lints/src/trivially_copy_pass_by_ref.rs +++ b/clippy_lints/src/trivially_copy_pass_by_ref.rs @@ -3,15 +3,14 @@ use std::cmp; use crate::utils::{is_copy, is_self_ty, snippet, span_lint_and_sugg}; use if_chain::if_chain; use matches::matches; -use rustc::impl_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::session::config::Config as SessionConfig; use rustc::ty; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::intravisit::FnKind; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_tool_lint, impl_lint_pass}; use rustc_span::Span; use rustc_target::abi::LayoutOf; use rustc_target::spec::abi::Abi; diff --git a/clippy_lints/src/try_err.rs b/clippy_lints/src/try_err.rs index 76c1decc611a..15f77d62201d 100644 --- a/clippy_lints/src/try_err.rs +++ b/clippy_lints/src/try_err.rs @@ -1,11 +1,11 @@ use crate::utils::{match_qpath, paths, snippet, snippet_with_macro_callsite, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::Ty; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for usages of `Err(x)?`. diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index 3edc220eda41..1a9c7502921d 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -6,22 +6,21 @@ use std::collections::BTreeMap; use if_chain::if_chain; use rustc::hir::map::Map; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty::layout::LayoutOf; use rustc::ty::{self, InferTy, Ty, TyCtxt, TypeckTables}; -use rustc::{declare_lint_pass, impl_lint_pass}; -use rustc_errors::Applicability; +use rustc_errors::{Applicability, DiagnosticBuilder}; use rustc_hir as hir; use rustc_hir::intravisit::{walk_body, walk_expr, walk_ty, FnKind, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint, impl_lint_pass}; use rustc_span::hygiene::{ExpnKind, MacroKind}; use rustc_span::source_map::Span; use rustc_span::symbol::{sym, Symbol}; use rustc_target::spec::abi::Abi; use rustc_typeck::hir_ty_to_ty; use syntax::ast::{FloatTy, IntTy, LitFloatType, LitIntType, LitKind, UintTy}; -use syntax::errors::DiagnosticBuilder; use crate::consts::{constant, Constant}; use crate::utils::paths; diff --git a/clippy_lints/src/unicode.rs b/clippy_lints/src/unicode.rs index ebef3c0faa81..eaf9f2e85cb6 100644 --- a/clippy_lints/src/unicode.rs +++ b/clippy_lints/src/unicode.rs @@ -1,9 +1,8 @@ use crate::utils::{is_allowed, snippet, span_lint_and_sugg}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use syntax::ast::LitKind; use unicode_normalization::UnicodeNormalization; diff --git a/clippy_lints/src/unsafe_removed_from_name.rs b/clippy_lints/src/unsafe_removed_from_name.rs index 008dc578bf90..023096398756 100644 --- a/clippy_lints/src/unsafe_removed_from_name.rs +++ b/clippy_lints/src/unsafe_removed_from_name.rs @@ -1,7 +1,6 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; use rustc_span::symbol::SymbolStr; use syntax::ast::*; diff --git a/clippy_lints/src/unused_io_amount.rs b/clippy_lints/src/unused_io_amount.rs index b51e13c39150..aa8ad4c489f8 100644 --- a/clippy_lints/src/unused_io_amount.rs +++ b/clippy_lints/src/unused_io_amount.rs @@ -1,8 +1,7 @@ use crate::utils::{is_try, match_qpath, match_trait_method, paths, span_lint}; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir as hir; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for unused written/read amount. diff --git a/clippy_lints/src/unused_self.rs b/clippy_lints/src/unused_self.rs index b145d354c894..caffb15cf810 100644 --- a/clippy_lints/src/unused_self.rs +++ b/clippy_lints/src/unused_self.rs @@ -1,11 +1,10 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::def::Res; use rustc_hir::intravisit::{walk_path, NestedVisitorMap, Visitor}; use rustc_hir::{AssocItemKind, HirId, ImplItemKind, ImplItemRef, Item, ItemKind, Path}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use crate::utils::span_help_and_lint; diff --git a/clippy_lints/src/unwrap.rs b/clippy_lints/src/unwrap.rs index 7a4fe159d8be..b21cf41ee523 100644 --- a/clippy_lints/src/unwrap.rs +++ b/clippy_lints/src/unwrap.rs @@ -1,11 +1,10 @@ use crate::utils::{higher::if_block, match_type, paths, span_lint_and_then, usage::is_potentially_mutated}; use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::intravisit::*; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs index 81e6e2e99cc5..3762f0d0a4f6 100644 --- a/clippy_lints/src/use_self.rs +++ b/clippy_lints/src/use_self.rs @@ -1,7 +1,6 @@ use if_chain::if_chain; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass}; +use rustc::lint::in_external_macro; use rustc::ty; use rustc::ty::{DefIdTree, Ty}; use rustc_errors::Applicability; @@ -9,7 +8,8 @@ use rustc_hir as hir; use rustc_hir::def::{DefKind, Res}; use rustc_hir::intravisit::{walk_item, walk_path, walk_ty, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::symbol::kw; use crate::utils::{differing_macro_contexts, span_lint_and_sugg}; diff --git a/clippy_lints/src/utils/author.rs b/clippy_lints/src/utils/author.rs index 902c3e2b7e72..52ccdf95d57b 100644 --- a/clippy_lints/src/utils/author.rs +++ b/clippy_lints/src/utils/author.rs @@ -2,16 +2,16 @@ //! to generate a clippy lint detecting said code automatically. use crate::utils::{get_attr, higher}; -use rustc::declare_lint_pass; use rustc::hir::map::Map; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass}; use rustc::session::Session; use rustc_data_structures::fx::FxHashMap; use rustc_hir as hir; use rustc_hir::intravisit::{NestedVisitorMap, Visitor}; use rustc_hir::{BindingAnnotation, Block, Expr, ExprKind, Pat, PatKind, QPath, Stmt, StmtKind, TyKind}; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::{Attribute, LitFloatType, LitKind}; +use syntax::walk_list; declare_clippy_lint! { /// **What it does:** Generates clippy code that detects the offending pattern @@ -617,9 +617,9 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor { start_pat, end_pat, end_kind, current ); self.current = start_pat; - self.visit_expr(start); + walk_list!(self, visit_expr, start); self.current = end_pat; - self.visit_expr(end); + walk_list!(self, visit_expr, end); }, PatKind::Slice(ref start, ref middle, ref end) => { let start_pat = self.next("start"); diff --git a/clippy_lints/src/utils/diagnostics.rs b/clippy_lints/src/utils/diagnostics.rs index 629dc0950dc3..4b832a8a104a 100644 --- a/clippy_lints/src/utils/diagnostics.rs +++ b/clippy_lints/src/utils/diagnostics.rs @@ -1,11 +1,10 @@ //! Clippy wrappers around rustc's diagnostic functions. -use rustc::lint::{LateContext, Lint, LintContext}; -use rustc_errors::{Applicability, CodeSuggestion, Substitution, SubstitutionPart, SuggestionStyle}; +use rustc_errors::{Applicability, CodeSuggestion, DiagnosticBuilder, Substitution, SubstitutionPart, SuggestionStyle}; use rustc_hir::HirId; +use rustc_lint::{LateContext, Lint, LintContext}; use rustc_span::source_map::{MultiSpan, Span}; use std::env; -use syntax::errors::DiagnosticBuilder; /// Wrapper around `DiagnosticBuilder` that adds a link to Clippy documentation for the emitted lint struct DiagnosticWrapper<'a>(DiagnosticBuilder<'a>); diff --git a/clippy_lints/src/utils/higher.rs b/clippy_lints/src/utils/higher.rs index 804ba8ae88d9..b046d7dc08f1 100644 --- a/clippy_lints/src/utils/higher.rs +++ b/clippy_lints/src/utils/higher.rs @@ -5,9 +5,9 @@ use crate::utils::{is_expn_of, match_def_path, match_qpath, paths}; use if_chain::if_chain; -use rustc::lint::LateContext; use rustc::ty; use rustc_hir as hir; +use rustc_lint::LateContext; use syntax::ast; /// Converts a hir binary operator to the corresponding `ast` type. diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs index 13ea90cff59b..c209ebaaf137 100644 --- a/clippy_lints/src/utils/hir_utils.rs +++ b/clippy_lints/src/utils/hir_utils.rs @@ -1,10 +1,10 @@ use crate::consts::{constant_context, constant_simple}; use crate::utils::differing_macro_contexts; use rustc::ich::StableHashingContextProvider; -use rustc::lint::LateContext; use rustc::ty::TypeckTables; use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; use rustc_hir::*; +use rustc_lint::LateContext; use std::hash::Hash; use syntax::ast::Name; @@ -194,8 +194,8 @@ impl<'a, 'tcx> SpanlessEq<'a, 'tcx> { (&PatKind::Tuple(ref l, ls), &PatKind::Tuple(ref r, rs)) => { ls == rs && over(l, r, |l, r| self.eq_pat(l, r)) }, - (&PatKind::Range(ref ls, ref le, ref li), &PatKind::Range(ref rs, ref re, ref ri)) => { - self.eq_expr(ls, rs) && self.eq_expr(le, re) && (*li == *ri) + (&PatKind::Range(ref ls, ref le, li), &PatKind::Range(ref rs, ref re, ri)) => { + both(ls, rs, |a, b| self.eq_expr(a, b)) && both(le, re, |a, b| self.eq_expr(a, b)) && (li == ri) }, (&PatKind::Ref(ref le, ref lm), &PatKind::Ref(ref re, ref rm)) => lm == rm && self.eq_pat(le, re), (&PatKind::Slice(ref ls, ref li, ref le), &PatKind::Slice(ref rs, ref ri, ref re)) => { diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs index 38bf6ee52396..23bce8b0fd82 100644 --- a/clippy_lints/src/utils/inspector.rs +++ b/clippy_lints/src/utils/inspector.rs @@ -1,12 +1,11 @@ //! checks for attributes use crate::utils::get_attr; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass}; use rustc::session::Session; use rustc_hir as hir; use rustc_hir::print; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass, LintContext}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::Attribute; declare_clippy_lint! { @@ -483,8 +482,12 @@ fn print_pat(cx: &LateContext<'_, '_>, pat: &hir::Pat<'_>, indent: usize) { }, hir::PatKind::Range(ref l, ref r, ref range_end) => { println!("{}Range", ind); - print_expr(cx, l, indent + 1); - print_expr(cx, r, indent + 1); + if let Some(expr) = l { + print_expr(cx, expr, indent + 1); + } + if let Some(expr) = r { + print_expr(cx, expr, indent + 1); + } match *range_end { hir::RangeEnd::Included => println!("{} end included", ind), hir::RangeEnd::Excluded => println!("{} end excluded", ind), diff --git a/clippy_lints/src/utils/internal_lints.rs b/clippy_lints/src/utils/internal_lints.rs index e63b29be9657..825e796382b5 100644 --- a/clippy_lints/src/utils/internal_lints.rs +++ b/clippy_lints/src/utils/internal_lints.rs @@ -4,15 +4,15 @@ use crate::utils::{ }; use if_chain::if_chain; use rustc::hir::map::Map; -use rustc::lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintArray, LintPass}; -use rustc::{declare_lint_pass, impl_lint_pass}; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_errors::Applicability; use rustc_hir as hir; use rustc_hir::def::{DefKind, Res}; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::*; +use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass}; use rustc_session::declare_tool_lint; +use rustc_session::{declare_lint_pass, impl_lint_pass}; use rustc_span::source_map::Span; use rustc_span::symbol::SymbolStr; use syntax::ast; diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 803a962f221f..797bccc2934c 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -26,7 +26,6 @@ use std::mem; use if_chain::if_chain; use matches::matches; use rustc::hir::map::Map; -use rustc::lint::{LateContext, Level, Lint, LintContext}; use rustc::traits; use rustc::traits::predicate_for_trait_def; use rustc::ty::{ @@ -42,6 +41,7 @@ use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE}; use rustc_hir::intravisit::{NestedVisitorMap, Visitor}; use rustc_hir::Node; use rustc_hir::*; +use rustc_lint::{LateContext, Level, Lint, LintContext}; use rustc_span::hygiene::ExpnKind; use rustc_span::symbol::{kw, Symbol}; use rustc_span::{BytePos, Pos, Span, DUMMY_SP}; diff --git a/clippy_lints/src/utils/ptr.rs b/clippy_lints/src/utils/ptr.rs index 03170fde4a65..8a59bcc98549 100644 --- a/clippy_lints/src/utils/ptr.rs +++ b/clippy_lints/src/utils/ptr.rs @@ -1,8 +1,8 @@ use crate::utils::{get_pat_name, match_var, snippet}; use rustc::hir::map::Map; -use rustc::lint::LateContext; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::*; +use rustc_lint::LateContext; use rustc_span::source_map::Span; use std::borrow::Cow; use syntax::ast::Name; diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs index f14390ce3af6..d3be8c906585 100644 --- a/clippy_lints/src/utils/sugg.rs +++ b/clippy_lints/src/utils/sugg.rs @@ -3,9 +3,9 @@ use crate::utils::{higher, snippet, snippet_opt, snippet_with_macro_callsite}; use matches::matches; -use rustc::lint::{EarlyContext, LateContext, LintContext}; use rustc_errors::Applicability; use rustc_hir as hir; +use rustc_lint::{EarlyContext, LateContext, LintContext}; use rustc_span::source_map::{CharPos, Span}; use rustc_span::{BytePos, Pos}; use std::borrow::Cow; diff --git a/clippy_lints/src/utils/usage.rs b/clippy_lints/src/utils/usage.rs index 623a12fbdaff..18fb01c5b17d 100644 --- a/clippy_lints/src/utils/usage.rs +++ b/clippy_lints/src/utils/usage.rs @@ -1,8 +1,8 @@ -use rustc::lint::LateContext; use rustc::ty; use rustc_data_structures::fx::FxHashSet; use rustc_hir::def::Res; use rustc_hir::*; +use rustc_lint::LateContext; use rustc_typeck::expr_use_visitor::*; /// Returns a set of mutated local variable IDs, or `None` if mutations could not be determined. diff --git a/clippy_lints/src/vec.rs b/clippy_lints/src/vec.rs index c5951dc1e78d..bc2c827b0afd 100644 --- a/clippy_lints/src/vec.rs +++ b/clippy_lints/src/vec.rs @@ -1,12 +1,11 @@ use crate::consts::constant; use crate::utils::{higher, is_copy, snippet_with_applicability, span_lint_and_sugg}; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty::{self, Ty}; use rustc_errors::Applicability; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/wildcard_dependencies.rs b/clippy_lints/src/wildcard_dependencies.rs index 30bd5195024b..2aa68842da41 100644 --- a/clippy_lints/src/wildcard_dependencies.rs +++ b/clippy_lints/src/wildcard_dependencies.rs @@ -1,7 +1,6 @@ use crate::utils::span_lint; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::source_map::DUMMY_SP; use syntax::ast::*; diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs index f459040905f8..0be52c2aa3d6 100644 --- a/clippy_lints/src/write.rs +++ b/clippy_lints/src/write.rs @@ -2,12 +2,11 @@ use std::borrow::Cow; use std::ops::Range; use crate::utils::{snippet_with_applicability, span_lint, span_lint_and_sugg, span_lint_and_then}; -use rustc::declare_lint_pass; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc_errors::Applicability; use rustc_lexer::unescape::{self, EscapeError}; +use rustc_lint::{EarlyContext, EarlyLintPass}; use rustc_parse::parser; -use rustc_session::declare_tool_lint; +use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::symbol::Symbol; use rustc_span::{BytePos, Span}; use syntax::ast::*; diff --git a/clippy_lints/src/zero_div_zero.rs b/clippy_lints/src/zero_div_zero.rs index 11cc594fb5dc..32275cbcc803 100644 --- a/clippy_lints/src/zero_div_zero.rs +++ b/clippy_lints/src/zero_div_zero.rs @@ -1,10 +1,9 @@ use crate::consts::{constant_simple, Constant}; use crate::utils::span_help_and_lint; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::*; -use rustc_session::declare_tool_lint; +use rustc_lint::{LateContext, LateLintPass}; +use rustc_session::{declare_lint_pass, declare_tool_lint}; declare_clippy_lint! { /// **What it does:** Checks for `0.0 / 0.0`. diff --git a/doc/adding_lints.md b/doc/adding_lints.md index f140950e47fe..45b80a6b0c12 100644 --- a/doc/adding_lints.md +++ b/doc/adding_lints.md @@ -127,8 +127,7 @@ where all the lint code is. We are going to call the file ```rust use rustc::lint::{LintArray, LintPass, EarlyLintPass}; -use rustc::declare_lint_pass; -use rustc_session::declare_tool_lint; +use rustc_session::{declare_lint_pass, declare_tool_lint}; ``` The next step is to provide a lint declaration. Lints are declared using the diff --git a/tests/ui/lint_without_lint_pass.rs b/tests/ui/lint_without_lint_pass.rs index 0f6eec521f4a..5b0b4d12d134 100644 --- a/tests/ui/lint_without_lint_pass.rs +++ b/tests/ui/lint_without_lint_pass.rs @@ -5,7 +5,8 @@ extern crate rustc; #[macro_use] extern crate rustc_session; -use rustc::lint::{LintArray, LintPass}; +extern crate rustc_lint; +use rustc_lint::{LintArray, LintPass}; declare_tool_lint! { pub clippy::TEST_LINT, diff --git a/tests/ui/lint_without_lint_pass.stderr b/tests/ui/lint_without_lint_pass.stderr index e7265150f8c0..75f7fa12aea2 100644 --- a/tests/ui/lint_without_lint_pass.stderr +++ b/tests/ui/lint_without_lint_pass.stderr @@ -1,5 +1,5 @@ error: the lint `TEST_LINT` is not added to any `LintPass` - --> $DIR/lint_without_lint_pass.rs:10:1 + --> $DIR/lint_without_lint_pass.rs:11:1 | LL | / declare_tool_lint! { LL | | pub clippy::TEST_LINT, diff --git a/tests/ui/match_overlapping_arm.rs b/tests/ui/match_overlapping_arm.rs index a48de440652e..97789bb766f8 100644 --- a/tests/ui/match_overlapping_arm.rs +++ b/tests/ui/match_overlapping_arm.rs @@ -1,4 +1,5 @@ #![feature(exclusive_range_pattern)] +#![feature(half_open_range_patterns)] #![warn(clippy::match_overlapping_arm)] #![allow(clippy::redundant_pattern_matching)] @@ -56,6 +57,21 @@ fn overlapping() { _ => (), } + /* + // FIXME(JohnTitor): uncomment this once rustfmt knows half-open patterns + match 42 { + 0.. => println!("0 .. 42"), + 3.. => println!("3 .. 42"), + _ => (), + } + + match 42 { + ..=23 => println!("0 ... 23"), + ..26 => println!("0 .. 26"), + _ => (), + } + */ + if let None = Some(42) { // nothing } else if let None = Some(42) { diff --git a/tests/ui/match_overlapping_arm.stderr b/tests/ui/match_overlapping_arm.stderr index dcd42fca7b46..eb20d5405a95 100644 --- a/tests/ui/match_overlapping_arm.stderr +++ b/tests/ui/match_overlapping_arm.stderr @@ -1,60 +1,60 @@ error: some ranges overlap - --> $DIR/match_overlapping_arm.rs:11:9 + --> $DIR/match_overlapping_arm.rs:12:9 | LL | 0..=10 => println!("0 ... 10"), | ^^^^^^ | = note: `-D clippy::match-overlapping-arm` implied by `-D warnings` note: overlaps with this - --> $DIR/match_overlapping_arm.rs:12:9 + --> $DIR/match_overlapping_arm.rs:13:9 | LL | 0..=11 => println!("0 ... 11"), | ^^^^^^ error: some ranges overlap - --> $DIR/match_overlapping_arm.rs:17:9 + --> $DIR/match_overlapping_arm.rs:18:9 | LL | 0..=5 => println!("0 ... 5"), | ^^^^^ | note: overlaps with this - --> $DIR/match_overlapping_arm.rs:19:9 + --> $DIR/match_overlapping_arm.rs:20:9 | LL | FOO..=11 => println!("0 ... 11"), | ^^^^^^^^ error: some ranges overlap - --> $DIR/match_overlapping_arm.rs:25:9 + --> $DIR/match_overlapping_arm.rs:26:9 | LL | 0..=5 => println!("0 ... 5"), | ^^^^^ | note: overlaps with this - --> $DIR/match_overlapping_arm.rs:24:9 + --> $DIR/match_overlapping_arm.rs:25:9 | LL | 2 => println!("2"), | ^ error: some ranges overlap - --> $DIR/match_overlapping_arm.rs:31:9 + --> $DIR/match_overlapping_arm.rs:32:9 | LL | 0..=2 => println!("0 ... 2"), | ^^^^^ | note: overlaps with this - --> $DIR/match_overlapping_arm.rs:30:9 + --> $DIR/match_overlapping_arm.rs:31:9 | LL | 2 => println!("2"), | ^ error: some ranges overlap - --> $DIR/match_overlapping_arm.rs:54:9 + --> $DIR/match_overlapping_arm.rs:55:9 | LL | 0..11 => println!("0 .. 11"), | ^^^^^ | note: overlaps with this - --> $DIR/match_overlapping_arm.rs:55:9 + --> $DIR/match_overlapping_arm.rs:56:9 | LL | 0..=11 => println!("0 ... 11"), | ^^^^^^ diff --git a/tests/ui/outer_expn_data.fixed b/tests/ui/outer_expn_data.fixed index 070279e82793..d1bb01ae87c0 100644 --- a/tests/ui/outer_expn_data.fixed +++ b/tests/ui/outer_expn_data.fixed @@ -3,13 +3,13 @@ #![deny(clippy::internal)] #![feature(rustc_private)] -#[macro_use] extern crate rustc; extern crate rustc_hir; +extern crate rustc_lint; #[macro_use] extern crate rustc_session; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::Expr; +use rustc_lint::{LateContext, LateLintPass}; declare_lint! { pub TEST_LINT, diff --git a/tests/ui/outer_expn_data.rs b/tests/ui/outer_expn_data.rs index 5e173e7fd99f..56a69982f265 100644 --- a/tests/ui/outer_expn_data.rs +++ b/tests/ui/outer_expn_data.rs @@ -3,13 +3,13 @@ #![deny(clippy::internal)] #![feature(rustc_private)] -#[macro_use] extern crate rustc; extern crate rustc_hir; +extern crate rustc_lint; #[macro_use] extern crate rustc_session; -use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc_hir::Expr; +use rustc_lint::{LateContext, LateLintPass}; declare_lint! { pub TEST_LINT,