Rollup merge of rust-lang#66478 - petrochenkov:rmplugin, r=davidtwco

rustc_plugin: Remove the compatibility shim The compatibility crate was introduced in rust-lang#62727 to migrate Cargo and some other tools, but now it's no longer necessary.
JohnTitor · Nov 19, 2019 · f27a0e0 · f27a0e0
2 parents a80f69c + 7f49f7b
commit f27a0e0
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -3541,7 +3541,6 @@ dependencies = [
  "rustc_metadata",
  "rustc_mir",
  "rustc_parse",
- "rustc_plugin",
  "rustc_plugin_impl",
  "rustc_resolve",
  "rustc_save_analysis",
@@ -3770,13 +3769,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
@@ -22,8 +22,7 @@ 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_plugin_impl = { path = "../librustc_plugin_impl" }
 rustc_save_analysis = { path = "../librustc_save_analysis" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_error_codes = { path = "../librustc_error_codes" }

diff --git 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_impl" }
 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
@@ -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
diff --git a/src/librustc_plugin/deprecated/lib.rs b/src/librustc_plugin/deprecated/lib.rs
diff --git a/src/librustc_plugin/Cargo.toml → src/librustc_plugin_impl/Cargo.toml b/src/librustc_plugin/Cargo.toml → src/librustc_plugin_impl/Cargo.toml
diff --git a/src/librustc_plugin/build.rs → src/librustc_plugin_impl/build.rs b/src/librustc_plugin/build.rs → src/librustc_plugin_impl/build.rs
diff --git a/src/librustc_plugin/lib.rs → src/librustc_plugin_impl/lib.rs b/src/librustc_plugin/lib.rs → src/librustc_plugin_impl/lib.rs
diff --git a/src/librustc_plugin/load.rs → src/librustc_plugin_impl/load.rs b/src/librustc_plugin/load.rs → src/librustc_plugin_impl/load.rs
diff --git a/src/librustc_plugin/registry.rs → src/librustc_plugin_impl/registry.rs b/src/librustc_plugin/registry.rs → src/librustc_plugin_impl/registry.rs