Auto merge of #5527 - flip1995:rollup-pr2htfd, r=flip1995

[rust.git] / src / driver.rs

diff --git a/src/driver.rs b/src/driver.rs
index 097b796e785b1abcb79af905397c6b85b559873e..2c699998ea90e237cdb708de9eb62507f3d0c60c 100644 (file)
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -5,17 +5,17 @@
 // FIXME: switch to something more ergonomic here, once available.
 // (Currently there is no way to opt into sysroot crates without `extern crate`.)
 #[allow(unused_extern_crates)]
-extern crate rustc;
-#[allow(unused_extern_crates)]
 extern crate rustc_driver;
 #[allow(unused_extern_crates)]
 extern crate rustc_errors;
 #[allow(unused_extern_crates)]
 extern crate rustc_interface;
+#[allow(unused_extern_crates)]
+extern crate rustc_middle;
 
-use rustc::ty::TyCtxt;
 use rustc_interface::interface;
-use rustc_tools_util::*;
+use rustc_middle::ty::TyCtxt;
+use rustc_tools_util::VersionInfo;
 
 use lazy_static::lazy_static;
 use std::borrow::Cow;
@@ -93,7 +93,7 @@ fn config(&mut self, config: &mut interface::Config) {
 
 #[allow(clippy::find_map, clippy::filter_map)]
 fn describe_lints() {
-    use lintlist::*;
+    use lintlist::{Level, Lint, ALL_LINTS, LINT_LEVELS};
     use std::collections::HashSet;
 
     println!(