From 9c534aaea859f455c7a1eebcdbf1a714cabdb969 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Sun, 15 Sep 2019 11:12:13 +0200
Subject: [PATCH] Apply missing #1544 after out-of-process compiler work

---
 rls-rustc/src/clippy.rs | 2 +-
 rls-rustc/src/lib.rs    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/rls-rustc/src/clippy.rs b/rls-rustc/src/clippy.rs
index 67388edc064..186219b5771 100644
--- a/rls-rustc/src/clippy.rs
+++ b/rls-rustc/src/clippy.rs
@@ -49,7 +49,7 @@ pub fn adjust_args(args: Vec<String>, preference: ClippyPreference) -> Vec<Strin
 
 #[cfg(feature = "clippy")]
 pub fn after_parse_callback(compiler: &rustc_interface::interface::Compiler) {
-    use rustc_plugin::registry::Registry;
+    use self::rustc_driver::plugin::registry::Registry;
 
     let sess = compiler.session();
     let mut registry = Registry::new(
diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs
index a3ff1057991..3d497cd598c 100644
--- a/rls-rustc/src/lib.rs
+++ b/rls-rustc/src/lib.rs
@@ -4,7 +4,6 @@ extern crate env_logger;
 extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_interface;
-extern crate rustc_plugin;
 extern crate rustc_save_analysis;
 extern crate syntax;