Auto merge of #5123 - JohnTitor:rustup-0202, r=matthiaskrgr

Rustup to rust-lang/rust#68133

changelog: none

clippy_lints/src/lib.rs

@@ -19,6 +19,10 @@ extern crate fmt_macros;
 #[allow(unused_extern_crates)]
 extern crate rustc;
 #[allow(unused_extern_crates)]
+extern crate rustc_ast_pretty;
+#[allow(unused_extern_crates)]
+extern crate rustc_attr;
+#[allow(unused_extern_crates)]
 extern crate rustc_data_structures;
 #[allow(unused_extern_crates)]
 extern crate rustc_driver;

clippy_lints/src/utils/mod.rs

@@ -34,6 +34,7 @@ use rustc::ty::{
  subst::GenericArg,
  Binder, Ty, TyCtxt,
 };
+use rustc_attr as attr;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
@@ -47,7 +48,6 @@ use rustc_span::symbol::{self, kw, Symbol};
 use rustc_span::{BytePos, Pos, Span, DUMMY_SP};
 use smallvec::SmallVec;
 use syntax::ast::{self, Attribute, LitKind};
-use syntax::attr;
 
 use crate::consts::{constant, Constant};
 use crate::reexport::*;

clippy_lints/src/utils/sugg.rs

@@ -3,6 +3,7 @@
 
 use crate::utils::{higher, snippet, snippet_opt, snippet_with_macro_callsite};
 use matches::matches;
+use rustc_ast_pretty::pprust::token_kind_to_string;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
 use rustc_lint::{EarlyContext, LateContext, LintContext};
@@ -12,7 +13,6 @@ use std::borrow::Cow;
 use std::convert::TryInto;
 use std::fmt::Display;
 use syntax::ast;
-use syntax::print::pprust::token_kind_to_string;
 use syntax::token;
 use syntax::util::parser::AssocOp;