diff --git a/clippy_lints/src/assign_ops.rs b/clippy_lints/src/assign_ops.rs index 5acdf8172e68..c2d0ccd1534e 100644 --- a/clippy_lints/src/assign_ops.rs +++ b/clippy_lints/src/assign_ops.rs @@ -4,6 +4,7 @@ use rustc::hir; use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast; /// **What it does:** Checks for compound assignment operations (`+=` and diff --git a/clippy_lints/src/attrs.rs b/clippy_lints/src/attrs.rs index c19f075cea37..9d8b8a7f9e60 100644 --- a/clippy_lints/src/attrs.rs +++ b/clippy_lints/src/attrs.rs @@ -8,6 +8,7 @@ use crate::utils::{ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, TyCtxt}; use semver::Version; use syntax::ast::{AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem, NestedMetaItemKind}; diff --git a/clippy_lints/src/bit_mask.rs b/clippy_lints/src/bit_mask.rs index e772042f0a69..2e4e60c412a3 100644 --- a/clippy_lints/src/bit_mask.rs +++ b/clippy_lints/src/bit_mask.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast::LitKind; use syntax::codemap::Span; use crate::utils::{span_lint, span_lint_and_then}; diff --git a/clippy_lints/src/bytecount.rs b/clippy_lints/src/bytecount.rs index f27961783e7f..f66c376c8642 100644 --- a/clippy_lints/src/bytecount.rs +++ b/clippy_lints/src/bytecount.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use syntax::ast::{Name, UintTy}; use crate::utils::{contains_name, get_pat_name, match_type, paths, single_segment_path, snippet, span_lint_and_sugg, diff --git a/clippy_lints/src/collapsible_if.rs b/clippy_lints/src/collapsible_if.rs index a2d280e75e3c..b77935196020 100644 --- a/clippy_lints/src/collapsible_if.rs +++ b/clippy_lints/src/collapsible_if.rs @@ -14,6 +14,7 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast; use crate::utils::{in_macro, snippet_block, span_lint_and_sugg, span_lint_and_then}; diff --git a/clippy_lints/src/default_trait_access.rs b/clippy_lints/src/default_trait_access.rs index 915386757f0e..4078237e8aa8 100644 --- a/clippy_lints/src/default_trait_access.rs +++ b/clippy_lints/src/default_trait_access.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::TypeVariants; use crate::utils::{any_parent_is_automatically_derived, match_def_path, opt_def_id, paths, span_lint_and_sugg}; diff --git a/clippy_lints/src/derive.rs b/clippy_lints/src/derive.rs index 02816ce9e4e5..0689ef25c207 100644 --- a/clippy_lints/src/derive.rs +++ b/clippy_lints/src/derive.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty}; use rustc::hir::*; use syntax::codemap::Span; diff --git a/clippy_lints/src/drop_forget_ref.rs b/clippy_lints/src/drop_forget_ref.rs index 8fb01d79a1ee..071afde986ad 100644 --- a/clippy_lints/src/drop_forget_ref.rs +++ b/clippy_lints/src/drop_forget_ref.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use rustc::hir::*; use crate::utils::{is_copy, match_def_path, opt_def_id, paths, span_note_and_lint}; diff --git a/clippy_lints/src/duration_subsec.rs b/clippy_lints/src/duration_subsec.rs index 4679ce158712..517befa7790f 100644 --- a/clippy_lints/src/duration_subsec.rs +++ b/clippy_lints/src/duration_subsec.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::codemap::Spanned; use crate::consts::{constant, Constant}; diff --git a/clippy_lints/src/entry.rs b/clippy_lints/src/entry.rs index 8f731e992ab6..26ee6be5796b 100644 --- a/clippy_lints/src/entry.rs +++ b/clippy_lints/src/entry.rs @@ -2,6 +2,7 @@ use rustc::hir::*; use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::codemap::Span; use crate::utils::SpanlessEq; use crate::utils::{get_item_name, match_type, paths, snippet, span_lint_and_then, walk_ptrs_ty}; diff --git a/clippy_lints/src/eval_order_dependence.rs b/clippy_lints/src/eval_order_dependence.rs index 33f6295a23bd..b0295d2e7d47 100644 --- a/clippy_lints/src/eval_order_dependence.rs +++ b/clippy_lints/src/eval_order_dependence.rs @@ -3,6 +3,7 @@ use rustc::hir::*; use rustc::ty; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast; use crate::utils::{get_parent_expr, span_lint, span_note_and_lint}; diff --git a/clippy_lints/src/excessive_precision.rs b/clippy_lints/src/excessive_precision.rs index a1c4484a2e55..28819077f9bc 100644 --- a/clippy_lints/src/excessive_precision.rs +++ b/clippy_lints/src/excessive_precision.rs @@ -1,6 +1,7 @@ use rustc::hir; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::TypeVariants; use std::f32; use std::f64; diff --git a/clippy_lints/src/explicit_write.rs b/clippy_lints/src/explicit_write.rs index 554d52d4499d..22e6834ee884 100644 --- a/clippy_lints/src/explicit_write.rs +++ b/clippy_lints/src/explicit_write.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use crate::utils::{is_expn_of, match_def_path, resolve_node, span_lint}; use crate::utils::opt_def_id; diff --git a/clippy_lints/src/fallible_impl_from.rs b/clippy_lints/src/fallible_impl_from.rs index b6136708e18b..18c3d807f1ab 100644 --- a/clippy_lints/src/fallible_impl_from.rs +++ b/clippy_lints/src/fallible_impl_from.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir; use rustc::ty; use syntax_pos::Span; diff --git a/clippy_lints/src/format.rs b/clippy_lints/src/format.rs index 31ae3eb0fec4..668ef3dbf6ef 100644 --- a/clippy_lints/src/format.rs +++ b/clippy_lints/src/format.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use syntax::ast::LitKind; use syntax_pos::Span; diff --git a/clippy_lints/src/infallible_destructuring_match.rs b/clippy_lints/src/infallible_destructuring_match.rs index 0f1ccddb3c44..8b8cb32deb1a 100644 --- a/clippy_lints/src/infallible_destructuring_match.rs +++ b/clippy_lints/src/infallible_destructuring_match.rs @@ -2,6 +2,7 @@ use super::utils::{get_arg_name, match_var, remove_blocks, snippet, span_lint_an use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; /// **What it does:** Checks for matches being used to destructure a single-variant enum /// or tuple struct where a `let` will suffice. diff --git a/clippy_lints/src/invalid_ref.rs b/clippy_lints/src/invalid_ref.rs index 8fd097edafd8..b529cb3ac381 100644 --- a/clippy_lints/src/invalid_ref.rs +++ b/clippy_lints/src/invalid_ref.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use rustc::hir::*; use crate::utils::{match_def_path, opt_def_id, paths, span_help_and_lint}; diff --git a/clippy_lints/src/let_if_seq.rs b/clippy_lints/src/let_if_seq.rs index dd8d1d175ccc..57ca5eff9553 100644 --- a/clippy_lints/src/let_if_seq.rs +++ b/clippy_lints/src/let_if_seq.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir; use rustc::hir::BindingAnnotation; use rustc::hir::def::Def; diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 6b6df8490014..1c4c4ef18fff 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -19,9 +19,6 @@ use toml; use rustc_plugin; -#[macro_use] -extern crate if_chain; - macro_rules! declare_clippy_lint { { pub $name:tt, style, $description:tt } => { declare_lint! { pub $name, Warn, $description } diff --git a/clippy_lints/src/literal_representation.rs b/clippy_lints/src/literal_representation.rs index 2788258a0cd8..bb5a923eaf9c 100644 --- a/clippy_lints/src/literal_representation.rs +++ b/clippy_lints/src/literal_representation.rs @@ -3,6 +3,7 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast::*; use syntax_pos; use crate::utils::{in_external_macro, snippet_opt, span_lint_and_sugg}; diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index f975df6001e0..86580c27cff8 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -7,6 +7,7 @@ use rustc::hir::intravisit::{walk_block, walk_decl, walk_expr, walk_pat, walk_st use rustc::hir::map::Node::{NodeBlock, NodeExpr, NodeStmt}; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::middle::region; // use rustc::middle::region::CodeExtent; use rustc::middle::expr_use_visitor::*; diff --git a/clippy_lints/src/map_clone.rs b/clippy_lints/src/map_clone.rs index 40bb23649358..0c427c5ffe4c 100644 --- a/clippy_lints/src/map_clone.rs +++ b/clippy_lints/src/map_clone.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use rustc::ty; use syntax::ast; diff --git a/clippy_lints/src/map_unit_fn.rs b/clippy_lints/src/map_unit_fn.rs index 99df6a41eef2..bd5613d0b487 100644 --- a/clippy_lints/src/map_unit_fn.rs +++ b/clippy_lints/src/map_unit_fn.rs @@ -1,6 +1,7 @@ use rustc::hir; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use rustc_errors::Applicability; use syntax::codemap::Span; diff --git a/clippy_lints/src/matches.rs b/clippy_lints/src/matches.rs index 82ed199e0cb0..65c360922b29 100644 --- a/clippy_lints/src/matches.rs +++ b/clippy_lints/src/matches.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty}; use std::cmp::Ordering; use std::collections::Bound; diff --git a/clippy_lints/src/methods.rs b/clippy_lints/src/methods.rs index 30c2941efe46..3ebad1d705b9 100644 --- a/clippy_lints/src/methods.rs +++ b/clippy_lints/src/methods.rs @@ -2,6 +2,7 @@ use matches::matches; use rustc::hir; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty}; use rustc::hir::def::Def; use std::borrow::Cow; diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs index 34afa1585aca..a32c95e96725 100644 --- a/clippy_lints/src/misc.rs +++ b/clippy_lints/src/misc.rs @@ -4,6 +4,7 @@ use rustc::hir::*; use rustc::hir::intravisit::FnKind; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use syntax::codemap::{ExpnFormat, Span}; use crate::utils::{get_item_name, get_parent_expr, implements_trait, in_constant, in_macro, is_integer_literal, diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs index a5ee070d9009..5bf7d5f3404c 100644 --- a/clippy_lints/src/misc_early.rs +++ b/clippy_lints/src/misc_early.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use std::collections::HashMap; use std::char; use syntax::ast::*; diff --git a/clippy_lints/src/needless_borrow.rs b/clippy_lints/src/needless_borrow.rs index 728ca969ac58..7986b43919c8 100644 --- a/clippy_lints/src/needless_borrow.rs +++ b/clippy_lints/src/needless_borrow.rs @@ -4,6 +4,7 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::{BindingAnnotation, Expr, ExprKind, MutImmutable, Pat, PatKind}; use rustc::ty; use rustc::ty::adjustment::{Adjust, Adjustment}; diff --git a/clippy_lints/src/needless_borrowed_ref.rs b/clippy_lints/src/needless_borrowed_ref.rs index ebefcfcca167..1679a9007b46 100644 --- a/clippy_lints/src/needless_borrowed_ref.rs +++ b/clippy_lints/src/needless_borrowed_ref.rs @@ -4,6 +4,7 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::{BindingAnnotation, MutImmutable, Pat, PatKind}; use crate::utils::{in_macro, snippet, span_lint_and_then}; diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs index 3300c9f23fb0..7463ea2d9c3d 100644 --- a/clippy_lints/src/needless_pass_by_value.rs +++ b/clippy_lints/src/needless_pass_by_value.rs @@ -4,6 +4,7 @@ use rustc::hir::map::*; use rustc::hir::intravisit::FnKind; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, RegionKind, TypeFoldable}; use rustc::traits; use rustc::middle::expr_use_visitor as euv; 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 fd2266c86144..70a47674d9fe 100644 --- a/clippy_lints/src/neg_cmp_op_on_partial_ord.rs +++ b/clippy_lints/src/neg_cmp_op_on_partial_ord.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use crate::utils::{self, paths, span_lint, in_external_macro}; diff --git a/clippy_lints/src/neg_multiply.rs b/clippy_lints/src/neg_multiply.rs index 0a12217e8d0c..96f2e58f3bed 100644 --- a/clippy_lints/src/neg_multiply.rs +++ b/clippy_lints/src/neg_multiply.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::codemap::{Span, Spanned}; use crate::consts::{self, Constant}; diff --git a/clippy_lints/src/new_without_default.rs b/clippy_lints/src/new_without_default.rs index 80c92042687e..a21927102923 100644 --- a/clippy_lints/src/new_without_default.rs +++ b/clippy_lints/src/new_without_default.rs @@ -2,6 +2,7 @@ use rustc::hir::def_id::DefId; use rustc::hir; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty}; use syntax::codemap::Span; use crate::utils::paths; diff --git a/clippy_lints/src/ok_if_let.rs b/clippy_lints/src/ok_if_let.rs index 6a21807b90b3..2a7f71c71452 100644 --- a/clippy_lints/src/ok_if_let.rs +++ b/clippy_lints/src/ok_if_let.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use crate::utils::{match_type, method_chain_args, paths, snippet, span_help_and_lint}; diff --git a/clippy_lints/src/overflow_check_conditional.rs b/clippy_lints/src/overflow_check_conditional.rs index 0ae400879da0..5714bdb521c8 100644 --- a/clippy_lints/src/overflow_check_conditional.rs +++ b/clippy_lints/src/overflow_check_conditional.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use crate::utils::{span_lint, SpanlessEq}; diff --git a/clippy_lints/src/panic_unimplemented.rs b/clippy_lints/src/panic_unimplemented.rs index 2edcef5bcda4..e8dfca24c574 100644 --- a/clippy_lints/src/panic_unimplemented.rs +++ b/clippy_lints/src/panic_unimplemented.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast::LitKind; use syntax::ptr::P; use syntax::ext::quote::rt::Span; diff --git a/clippy_lints/src/partialeq_ne_impl.rs b/clippy_lints/src/partialeq_ne_impl.rs index e001bbebd3c2..675d014c527a 100644 --- a/clippy_lints/src/partialeq_ne_impl.rs +++ b/clippy_lints/src/partialeq_ne_impl.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use crate::utils::{is_automatically_derived, span_lint}; diff --git a/clippy_lints/src/ptr.rs b/clippy_lints/src/ptr.rs index 5093819db5f5..167ce84f803f 100644 --- a/clippy_lints/src/ptr.rs +++ b/clippy_lints/src/ptr.rs @@ -6,6 +6,7 @@ use rustc::hir::map::NodeItem; use rustc::hir::QPath; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use syntax::ast::NodeId; use syntax::codemap::Span; diff --git a/clippy_lints/src/question_mark.rs b/clippy_lints/src/question_mark.rs index 9ede9afebd73..b2d53e124ff4 100644 --- a/clippy_lints/src/question_mark.rs +++ b/clippy_lints/src/question_mark.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use rustc::hir::def::Def; use crate::utils::sugg::Sugg; diff --git a/clippy_lints/src/ranges.rs b/clippy_lints/src/ranges.rs index 03bf7be4285f..9525ea014a9e 100644 --- a/clippy_lints/src/ranges.rs +++ b/clippy_lints/src/ranges.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use syntax::ast::RangeLimits; use syntax::codemap::Spanned; diff --git a/clippy_lints/src/reference.rs b/clippy_lints/src/reference.rs index 6baa61745634..27aca6f4bf1a 100644 --- a/clippy_lints/src/reference.rs +++ b/clippy_lints/src/reference.rs @@ -1,6 +1,7 @@ use syntax::ast::{Expr, ExprKind, UnOp}; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use crate::utils::{snippet, span_lint_and_sugg}; /// **What it does:** Checks for usage of `*&` and `*&mut` in expressions. diff --git a/clippy_lints/src/regex.rs b/clippy_lints/src/regex.rs index 114a14bdf967..39b7888dcc60 100644 --- a/clippy_lints/src/regex.rs +++ b/clippy_lints/src/regex.rs @@ -2,6 +2,7 @@ use regex_syntax; use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use std::collections::HashSet; use syntax::ast::{LitKind, NodeId, StrStyle}; use syntax::codemap::{BytePos, Span}; diff --git a/clippy_lints/src/replace_consts.rs b/clippy_lints/src/replace_consts.rs index 5f5957b02099..b9a4c6ebb195 100644 --- a/clippy_lints/src/replace_consts.rs +++ b/clippy_lints/src/replace_consts.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir; use rustc::hir::def::Def; use crate::utils::{match_def_path, span_lint_and_sugg}; diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs index 29d50d87fb8d..2bfc1e7d1071 100644 --- a/clippy_lints/src/returns.rs +++ b/clippy_lints/src/returns.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use syntax::ast; use syntax::codemap::Span; use syntax::visit::FnKind; diff --git a/clippy_lints/src/suspicious_trait_impl.rs b/clippy_lints/src/suspicious_trait_impl.rs index 704ad04325da..bd0f6dc68dcc 100644 --- a/clippy_lints/src/suspicious_trait_impl.rs +++ b/clippy_lints/src/suspicious_trait_impl.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir; use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use syntax::ast; diff --git a/clippy_lints/src/swap.rs b/clippy_lints/src/swap.rs index e76cf78f8d10..4278d6d74ac6 100644 --- a/clippy_lints/src/swap.rs +++ b/clippy_lints/src/swap.rs @@ -2,6 +2,7 @@ use matches::matches; use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty; use crate::utils::{differing_macro_contexts, match_type, paths, snippet, span_lint_and_then, walk_ptrs_ty, SpanlessEq}; use crate::utils::sugg::Sugg; diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs index 7abf5fdcc923..aa964e4558f3 100644 --- a/clippy_lints/src/transmute.rs +++ b/clippy_lints/src/transmute.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty}; use rustc::hir::*; use std::borrow::Cow; diff --git a/clippy_lints/src/trivially_copy_pass_by_ref.rs b/clippy_lints/src/trivially_copy_pass_by_ref.rs index 8d2b21058cf6..b6fd8db51575 100644 --- a/clippy_lints/src/trivially_copy_pass_by_ref.rs +++ b/clippy_lints/src/trivially_copy_pass_by_ref.rs @@ -6,6 +6,7 @@ use rustc::hir::map::*; use rustc::hir::intravisit::FnKind; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::TypeVariants; use rustc::session::config::Config as SessionConfig; use rustc_target::spec::abi::Abi; diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index df14eb159570..2921b502c1f8 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -4,6 +4,7 @@ use rustc::hir::*; use rustc::hir::intravisit::{walk_body, walk_expr, walk_ty, FnKind, NestedVisitorMap, Visitor}; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty, TyCtxt, TypeckTables}; use rustc::ty::layout::LayoutOf; use rustc_typeck::hir_ty_to_ty; diff --git a/clippy_lints/src/unwrap.rs b/clippy_lints/src/unwrap.rs index 4f7e9e9c0a15..6cafcaeffe97 100644 --- a/clippy_lints/src/unwrap.rs +++ b/clippy_lints/src/unwrap.rs @@ -1,5 +1,6 @@ use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use crate::utils::{in_macro, match_type, paths, span_lint_and_then, usage::is_potentially_mutated}; use rustc::hir::intravisit::*; diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs index 3b6773792986..2ea4497a0d1b 100644 --- a/clippy_lints/src/use_self.rs +++ b/clippy_lints/src/use_self.rs @@ -1,5 +1,6 @@ use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use rustc::hir::intravisit::{walk_path, NestedVisitorMap, Visitor}; use crate::utils::{in_macro, span_lint_and_then}; diff --git a/clippy_lints/src/utils/higher.rs b/clippy_lints/src/utils/higher.rs index 3f0243a91c07..d63a2dae8025 100644 --- a/clippy_lints/src/utils/higher.rs +++ b/clippy_lints/src/utils/higher.rs @@ -3,6 +3,7 @@ #![deny(missing_docs_in_private_items)] +use if_chain::if_chain; use rustc::{hir, ty}; use rustc::lint::LateContext; use syntax::ast; diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 1888321827d1..64840a39fe1a 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -1,5 +1,6 @@ use crate::reexport::*; use matches::matches; +use if_chain::if_chain; use rustc::hir; use rustc::hir::*; use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX}; diff --git a/clippy_lints/src/vec.rs b/clippy_lints/src/vec.rs index 68caa5b44942..a58d73f86daa 100644 --- a/clippy_lints/src/vec.rs +++ b/clippy_lints/src/vec.rs @@ -1,6 +1,7 @@ use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::ty::{self, Ty}; use syntax::codemap::Span; use crate::utils::{higher, is_copy, snippet, span_lint_and_sugg}; diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs index 5112ad86ff0b..0f0bd64cb61d 100644 --- a/clippy_lints/src/write.rs +++ b/clippy_lints/src/write.rs @@ -2,6 +2,7 @@ use rustc::hir::map::Node::{NodeImplItem, NodeItem}; use rustc::hir::*; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use std::ops::Deref; use syntax::ast::LitKind; use syntax::ptr; diff --git a/clippy_lints/src/zero_div_zero.rs b/clippy_lints/src/zero_div_zero.rs index 0b1b3a413055..7c8af7880ba2 100644 --- a/clippy_lints/src/zero_div_zero.rs +++ b/clippy_lints/src/zero_div_zero.rs @@ -1,6 +1,7 @@ use crate::consts::{constant_simple, Constant}; use rustc::lint::*; use rustc::{declare_lint, lint_array}; +use if_chain::if_chain; use rustc::hir::*; use crate::utils::span_help_and_lint;