Fix fallout after rust-lang/rust#69920

rls-rustc/src/lib.rs

@@ -1,14 +1,14 @@
 #![feature(rustc_private)]
 
 extern crate env_logger;
-extern crate rustc;
+extern crate rustc_session;
 extern crate rustc_driver;
 extern crate rustc_interface;
 extern crate rustc_save_analysis;
 extern crate rustc_span;
 
-use rustc::session::config::ErrorOutputType;
-use rustc::session::early_error;
+use rustc_session::config::ErrorOutputType;
+use rustc_session::early_error;
 #[cfg(feature = "ipc")]
 use rustc_driver::Compilation;
 use rustc_driver::{run_compiler, Callbacks};
@@ -107,7 +107,7 @@ impl Callbacks for ShimCalls {
         compiler: &interface::Compiler,
         queries: &'tcx Queries<'tcx>,
     ) -> Compilation {
-        use rustc::session::config::Input;
+        use rustc_session::config::Input;
 
         use futures::future::Future;
         use rls_ipc::rpc::{Crate, Edition};
@@ -213,7 +213,7 @@ impl Callbacks for ShimCalls {
 }
 
 #[cfg(feature = "ipc")]
-fn fetch_input_files(sess: &rustc::session::Session) -> Vec<PathBuf> {
+fn fetch_input_files(sess: &rustc_session::Session) -> Vec<PathBuf> {
     let cwd = &sess.working_dir.0;
 
     sess.source_map()

rls/src/build/rustc.rs

@@ -3,7 +3,7 @@
 #[allow(unused_extern_crates)]
 extern crate getopts;
 #[allow(unused_extern_crates)]
-extern crate rustc;
+extern crate rustc_session;
 #[allow(unused_extern_crates)]
 extern crate rustc_codegen_utils;
 #[allow(unused_extern_crates)]
@@ -34,8 +34,8 @@ use log::trace;
 use rls_data::Analysis;
 use rls_vfs::Vfs;
 
-use self::rustc::session::config::Input;
-use self::rustc::session::Session;
+use self::rustc_session::config::Input;
+use self::rustc_session::Session;
 use self::rustc_driver::{run_compiler, Compilation};
 use self::rustc_interface::interface;
 use self::rustc_interface::Queries;