Auto merge of #5040 - JohnTitor:rustup-0111, r=flip1995

Some rustups

changelog: none

Author: bors

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::lint::{LateContext, LateLintPass};
 use rustc_hir::*;
-use rustc_session::declare_tool_lint;
+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};

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::lint::{LateContext, LateLintPass};
 use rustc_hir as hir;
-use rustc_session::declare_tool_lint;
+use rustc_session::{declare_tool_lint, impl_lint_pass};
 use rustc_span::source_map::Span;
 
 declare_clippy_lint! {