Auto merge of #4938 - flip1995:rustup, r=flip1995

[rust.git] / clippy_lints / src / try_err.rs

diff --git a/clippy_lints/src/try_err.rs b/clippy_lints/src/try_err.rs
index 0985f966e8eb8876650193caae2df06363e1bd3d..8c3e755ef1735025a6c88c4fa26f0eeb70ded55b 100644 (file)
--- a/clippy_lints/src/try_err.rs
+++ b/clippy_lints/src/try_err.rs
@@ -1,10 +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::hir::*;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::Ty;
-use rustc::{declare_lint_pass, declare_tool_lint};
 use rustc_errors::Applicability;
+use rustc_session::declare_tool_lint;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for usages of `Err(x)?`.