From ce7a579cace5de621071a9e18416268e93246fdd Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 16 Nov 2019 23:35:27 +0300
Subject: [PATCH] rustc_plugin: Remove the compatibility shim

---
 Cargo.lock                                |  8 --------
 src/librustc_driver/Cargo.toml            |  1 -
 src/librustc_interface/Cargo.toml         |  2 +-
 src/librustc_interface/passes.rs          |  4 ++--
 src/librustc_plugin/deprecated/Cargo.toml | 14 --------------
 src/librustc_plugin/deprecated/lib.rs     |  8 --------
 6 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 src/librustc_plugin/deprecated/Cargo.toml
 delete mode 100644 src/librustc_plugin/deprecated/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2ecb38851e7..1923032a4dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3529,7 +3529,6 @@ dependencies = [
  "rustc_metadata",
  "rustc_mir",
  "rustc_parse",
- "rustc_plugin",
  "rustc_plugin_impl",
  "rustc_resolve",
  "rustc_save_analysis",
@@ -3758,13 +3757,6 @@ dependencies = [
  "syntax_pos",
 ]
 
-[[package]]
-name = "rustc_plugin"
-version = "0.0.0"
-dependencies = [
- "rustc_plugin_impl",
-]
-
 [[package]]
 name = "rustc_plugin_impl"
 version = "0.0.0"
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
index ff673e52b60..f9613d1aafc 100644
--- a/src/librustc_driver/Cargo.toml
+++ b/src/librustc_driver/Cargo.toml
@@ -22,7 +22,6 @@ errors = { path = "../librustc_errors", package = "rustc_errors" }
 rustc_metadata = { path = "../librustc_metadata" }
 rustc_mir = { path = "../librustc_mir" }
 rustc_parse = { path = "../librustc_parse" }
-rustc_plugin = { path = "../librustc_plugin/deprecated" } # To get this in the sysroot
 rustc_plugin_impl = { path = "../librustc_plugin" }
 rustc_save_analysis = { path = "../librustc_save_analysis" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml
index de59882bbdf..7efcc2855bb 100644
--- a/src/librustc_interface/Cargo.toml
+++ b/src/librustc_interface/Cargo.toml
@@ -31,7 +31,7 @@ rustc_passes = { path = "../librustc_passes" }
 rustc_typeck = { path = "../librustc_typeck" }
 rustc_lint = { path = "../librustc_lint" }
 rustc_errors = { path = "../librustc_errors" }
-rustc_plugin = { path = "../librustc_plugin", package = "rustc_plugin_impl" }
+rustc_plugin_impl = { path = "../librustc_plugin" }
 rustc_privacy = { path = "../librustc_privacy" }
 rustc_resolve = { path = "../librustc_resolve" }
 tempfile = "3.0.5"
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index 86d58bfe8bd..5df814da770 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -29,8 +29,8 @@ use rustc_metadata::cstore;
 use rustc_mir as mir;
 use rustc_parse::{parse_crate_from_file, parse_crate_from_source_str};
 use rustc_passes::{self, ast_validation, hir_stats, layout_test};
-use rustc_plugin as plugin;
-use rustc_plugin::registry::Registry;
+use rustc_plugin_impl as plugin;
+use rustc_plugin_impl::registry::Registry;
 use rustc_privacy;
 use rustc_resolve::{Resolver, ResolverArenas};
 use rustc_traits;
diff --git a/src/librustc_plugin/deprecated/Cargo.toml b/src/librustc_plugin/deprecated/Cargo.toml
deleted file mode 100644
index cc75f7b9ab2..00000000000
--- a/src/librustc_plugin/deprecated/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_plugin"
-version = "0.0.0"
-build = false
-edition = "2018"
-
-[lib]
-name = "rustc_plugin"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_plugin_impl = { path = ".." }
diff --git a/src/librustc_plugin/deprecated/lib.rs b/src/librustc_plugin/deprecated/lib.rs
deleted file mode 100644
index 1d0afe84c25..00000000000
--- a/src/librustc_plugin/deprecated/lib.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-#![feature(staged_api)]
-#![unstable(feature = "rustc_private", issue = "27812")]
-#![rustc_deprecated(since = "1.38.0", reason = "\
-    import this through `rustc_driver::plugin` instead to make TLS work correctly. \
-    See https://github.com/rust-lang/rust/issues/62717")]
-
-pub use rustc_plugin_impl::*;