Skip to content

Commit f27a0e0

Browse files
authored
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.
2 parents a80f69c + 7f49f7b commit f27a0e0

File tree

11 files changed

+4
-35
lines changed

11 files changed

+4
-35
lines changed

Cargo.lock

-8
Original file line numberDiff line numberDiff line change
@@ -3541,7 +3541,6 @@ dependencies = [
35413541
"rustc_metadata",
35423542
"rustc_mir",
35433543
"rustc_parse",
3544-
"rustc_plugin",
35453544
"rustc_plugin_impl",
35463545
"rustc_resolve",
35473546
"rustc_save_analysis",
@@ -3770,13 +3769,6 @@ dependencies = [
37703769
"syntax_pos",
37713770
]
37723771

3773-
[[package]]
3774-
name = "rustc_plugin"
3775-
version = "0.0.0"
3776-
dependencies = [
3777-
"rustc_plugin_impl",
3778-
]
3779-
37803772
[[package]]
37813773
name = "rustc_plugin_impl"
37823774
version = "0.0.0"

src/librustc_driver/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ errors = { path = "../librustc_errors", package = "rustc_errors" }
2222
rustc_metadata = { path = "../librustc_metadata" }
2323
rustc_mir = { path = "../librustc_mir" }
2424
rustc_parse = { path = "../librustc_parse" }
25-
rustc_plugin = { path = "../librustc_plugin/deprecated" } # To get this in the sysroot
26-
rustc_plugin_impl = { path = "../librustc_plugin" }
25+
rustc_plugin_impl = { path = "../librustc_plugin_impl" }
2726
rustc_save_analysis = { path = "../librustc_save_analysis" }
2827
rustc_codegen_utils = { path = "../librustc_codegen_utils" }
2928
rustc_error_codes = { path = "../librustc_error_codes" }

src/librustc_interface/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rustc_passes = { path = "../librustc_passes" }
3131
rustc_typeck = { path = "../librustc_typeck" }
3232
rustc_lint = { path = "../librustc_lint" }
3333
rustc_errors = { path = "../librustc_errors" }
34-
rustc_plugin = { path = "../librustc_plugin", package = "rustc_plugin_impl" }
34+
rustc_plugin_impl = { path = "../librustc_plugin_impl" }
3535
rustc_privacy = { path = "../librustc_privacy" }
3636
rustc_resolve = { path = "../librustc_resolve" }
3737
tempfile = "3.0.5"

src/librustc_interface/passes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use rustc_metadata::cstore;
2929
use rustc_mir as mir;
3030
use rustc_parse::{parse_crate_from_file, parse_crate_from_source_str};
3131
use rustc_passes::{self, ast_validation, hir_stats, layout_test};
32-
use rustc_plugin as plugin;
33-
use rustc_plugin::registry::Registry;
32+
use rustc_plugin_impl as plugin;
33+
use rustc_plugin_impl::registry::Registry;
3434
use rustc_privacy;
3535
use rustc_resolve::{Resolver, ResolverArenas};
3636
use rustc_traits;

src/librustc_plugin/deprecated/Cargo.toml

-14
This file was deleted.

src/librustc_plugin/deprecated/lib.rs

-8
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)