use crate::utils::span_lint_and_sugg;
+use rustc::declare_lint_pass;
use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
use rustc_errors::Applicability;
+use rustc_session::declare_tool_lint;
use std::convert::TryFrom;
use syntax::ast;
use syntax::source_map::{BytePos, Span};