Fix broken imports.

Author: xiongmao86

clippy_lints/src/approx_const.rs

@@ -1,5 +1,5 @@
 use crate::utils::span_lint;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::*;
 use rustc_session::declare_tool_lint;

clippy_lints/src/arithmetic.rs

@@ -1,6 +1,6 @@
 use crate::consts::constant_simple;
 use crate::utils::span_lint;
-use rustc::impl_lint_pass;
+use rustc_session::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir as hir;
 use rustc_session::declare_tool_lint;

clippy_lints/src/as_conversions.rs

@@ -1,4 +1,4 @@
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
 use rustc_session::declare_tool_lint;
 use syntax::ast::*;

clippy_lints/src/assertions_on_constants.rs

@@ -2,7 +2,7 @@ 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::*;
 use rustc_session::declare_tool_lint;

clippy_lints/src/assign_ops.rs

@@ -3,7 +3,7 @@ use crate::utils::{
 };
 use crate::utils::{higher, sugg};
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::hir::map::Map;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;

clippy_lints/src/atomic_ordering.rs

@@ -1,6 +1,6 @@
 use crate::utils::{match_def_path, span_help_and_lint};
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_hir::def_id::DefId;

clippy_lints/src/attrs.rs

@@ -6,7 +6,7 @@ use crate::utils::{
     span_lint_and_then, without_block_comments,
 };
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{
     in_external_macro, CheckLintNameResult, EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintArray,
     LintContext, LintPass,

clippy_lints/src/bit_mask.rs

@@ -2,7 +2,7 @@ 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_session::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/blacklisted_name.rs

@@ -1,5 +1,5 @@
 use crate::utils::span_lint;
-use rustc::impl_lint_pass;
+use rustc_session::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir::*;

clippy_lints/src/block_in_if_condition.rs

@@ -1,6 +1,6 @@
 use crate::utils::*;
 use matches::matches;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::hir::map::Map;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};

clippy_lints/src/booleans.rs

@@ -3,7 +3,7 @@ use crate::utils::{
     span_lint_and_then, SpanlessEq,
 };
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::hir::map::Map;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;

clippy_lints/src/bytecount.rs

@@ -3,7 +3,7 @@ use crate::utils::{
     span_lint_and_sugg, walk_ptrs_ty,
 };
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_errors::Applicability;

clippy_lints/src/cargo_common_metadata.rs

@@ -3,7 +3,7 @@
 use std::path::PathBuf;
 
 use crate::utils::span_lint;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
 use rustc_span::source_map::DUMMY_SP;

clippy_lints/src/checked_conversions.rs

@@ -1,7 +1,7 @@
 //! 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_session::declare_lint_pass;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/cognitive_complexity.rs

@@ -1,7 +1,7 @@
 //! calculate cognitive complexity and warn about overly complex functions
 
 use rustc::hir::map::Map;
-use rustc::impl_lint_pass;
+use rustc_session::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_hir::intravisit::{walk_expr, FnKind, NestedVisitorMap, Visitor};
 use rustc_hir::*;

clippy_lints/src/collapsible_if.rs

@@ -13,7 +13,7 @@
 //! This lint is **warn** by default
 
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
 use syntax::ast;

clippy_lints/src/comparison_chain.rs

@@ -1,7 +1,7 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::*;
 use rustc_session::declare_tool_lint;

clippy_lints/src/copies.rs

@@ -1,6 +1,6 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::Ty;
 use rustc_data_structures::fx::FxHashMap;

clippy_lints/src/copy_iterator.rs

@@ -1,5 +1,5 @@
 use crate::utils::{is_copy, match_path, paths, span_note_and_lint};
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::{Item, ItemKind};
 use rustc_session::declare_tool_lint;

clippy_lints/src/dbg_macro.rs

@@ -1,5 +1,5 @@
 use crate::utils::{snippet_opt, span_help_and_lint, span_lint_and_sugg};
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;

clippy_lints/src/default_trait_access.rs

@@ -1,5 +1,5 @@
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_errors::Applicability;

clippy_lints/src/derive.rs

@@ -1,7 +1,7 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::{self, Ty};
 use rustc_hir::*;

clippy_lints/src/doc.rs

@@ -1,6 +1,6 @@
 use crate::utils::{match_type, paths, return_ty, span_lint};
 use itertools::Itertools;
-use rustc::impl_lint_pass;
+use rustc_session::impl_lint_pass;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;

clippy_lints/src/double_comparison.rs

@@ -1,6 +1,6 @@
 //! Lint on unnecessary double comparisons. Some examples:
 
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/double_parens.rs

@@ -1,5 +1,5 @@
 use crate::utils::span_lint;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
 use syntax::ast::*;

clippy_lints/src/drop_bounds.rs

@@ -1,6 +1,6 @@
 use crate::utils::{match_def_path, paths, span_lint};
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateLintPass, LintArray, LintPass};
 use rustc_hir::*;
 use rustc_session::declare_tool_lint;

clippy_lints/src/drop_forget_ref.rs

@@ -1,6 +1,6 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_hir::*;

clippy_lints/src/duration_subsec.rs

@@ -1,5 +1,5 @@
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/else_if_without_else.rs

@@ -1,6 +1,6 @@
 //! Lint on if expressions with an else if, but without a final else branch.
 
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
 use rustc_session::declare_tool_lint;
 use syntax::ast::*;

clippy_lints/src/empty_enum.rs

@@ -1,7 +1,7 @@
 //! lint when there is an enum with no variants
 
 use crate::utils::span_lint_and_then;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::*;
 use rustc_session::declare_tool_lint;

clippy_lints/src/entry.rs

@@ -2,7 +2,7 @@ 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_session::declare_lint_pass;
 use rustc::hir::map::Map;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;

clippy_lints/src/enum_clike.rs

@@ -3,7 +3,7 @@
 
 use crate::consts::{miri_to_const, Constant};
 use crate::utils::span_lint;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc::ty::util::IntTypeExt;

clippy_lints/src/enum_glob_use.rs

@@ -1,7 +1,7 @@
 //! lint on `use`ing all variants of an enum
 
 use crate::utils::span_lint;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::*;

clippy_lints/src/enum_variants.rs

@@ -2,7 +2,7 @@
 
 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_session::impl_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, Lint, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
 use rustc_span::source_map::Span;

clippy_lints/src/eq_op.rs

@@ -1,5 +1,5 @@
 use crate::utils::{implements_trait, is_copy, multispan_sugg, snippet, span_lint, span_lint_and_then, SpanlessEq};
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/erasing_op.rs

@@ -1,4 +1,4 @@
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::*;
 use rustc_session::declare_tool_lint;

clippy_lints/src/escape.rs

@@ -1,4 +1,4 @@
-use rustc::impl_lint_pass;
+use rustc_session::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::layout::LayoutOf;
 use rustc::ty::{self, Ty};

clippy_lints/src/eta_reduction.rs

@@ -1,6 +1,6 @@
 use if_chain::if_chain;
 use matches::matches;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc::ty::{self, Ty};
 use rustc_errors::Applicability;

clippy_lints/src/eval_order_dependence.rs

@@ -1,6 +1,6 @@
 use crate::utils::{get_parent_expr, span_lint, span_note_and_lint};
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::hir::map::Map;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;

clippy_lints/src/excessive_precision.rs

@@ -1,7 +1,7 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_errors::Applicability;

clippy_lints/src/exit.rs

@@ -1,6 +1,6 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_hir::{Expr, ExprKind, Item, ItemKind, Node};
 use rustc_session::declare_tool_lint;

clippy_lints/src/explicit_write.rs

@@ -1,6 +1,6 @@
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/fallible_impl_from.rs

@@ -1,7 +1,7 @@
 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_session::declare_lint_pass;
 use rustc::hir::map::Map;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::{self, Ty};

clippy_lints/src/format.rs

@@ -4,7 +4,7 @@ use crate::utils::{
     walk_ptrs_ty,
 };
 use if_chain::if_chain;
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/formatting.rs

@@ -1,6 +1,6 @@
 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_session::declare_lint_pass;
 use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
 use syntax::ast::*;

clippy_lints/src/functions.rs

@@ -5,7 +5,7 @@ use crate::utils::{
 };
 use matches::matches;
 use rustc::hir::map::Map;
-use rustc::impl_lint_pass;
+use rustc_session::impl_lint_pass;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::FxHashSet;

clippy_lints/src/get_last_with_len.rs

@@ -2,7 +2,7 @@
 
 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_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::{BinOpKind, Expr, ExprKind};

clippy_lints/src/identity_conversion.rs

@@ -1,7 +1,7 @@
 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_session::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_hir::*;

clippy_lints/src/identity_op.rs

@@ -1,4 +1,4 @@
-use rustc::declare_lint_pass;
+use rustc_session::declare_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_hir::*;