diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-20 16:26:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 16:26:43 +0200 |
| commit | cadf6b9343f1069a2601dd716e4e2ca52b519171 (patch) | |
| tree | ada36beb33778a3545128deb9706d6b3cbb458dc | |
| parent | 3662a9fb0476f5d4209ef2471b33ce4199e01fbe (diff) | |
| parent | c561abeea24a6cd2cae2d1392c8e3b2a43e3f753 (diff) | |
| download | rust-cadf6b9343f1069a2601dd716e4e2ca52b519171.tar.gz rust-cadf6b9343f1069a2601dd716e4e2ca52b519171.zip | |
Rollup merge of #63736 - SimonSapin:plugin, r=eddyb
Restore the rustc_plugin crate in the sysroot It was accidentally removed in a rebase of https://github.com/rust-lang/rust/pull/62727 Fixes https://github.com/rust-lang/rust/issues/63729 (rls build failure)
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | src/librustc_driver/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_plugin/deprecated/lib.rs | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9e7dd54e135..3af482adc34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3189,6 +3189,7 @@ dependencies = [ "rustc_interface", "rustc_metadata", "rustc_mir", + "rustc_plugin", "rustc_plugin_impl", "rustc_save_analysis", "rustc_target", @@ -3373,6 +3374,13 @@ dependencies = [ ] [[package]] +name = "rustc_plugin" +version = "0.0.0" +dependencies = [ + "rustc_plugin_impl", +] + +[[package]] name = "rustc_plugin_impl" version = "0.0.0" dependencies = [ diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml index f7a423092ac..b030517e28e 100644 --- a/src/librustc_driver/Cargo.toml +++ b/src/librustc_driver/Cargo.toml @@ -20,6 +20,7 @@ rustc_data_structures = { path = "../librustc_data_structures" } errors = { path = "../librustc_errors", package = "rustc_errors" } rustc_metadata = { path = "../librustc_metadata" } rustc_mir = { path = "../librustc_mir" } +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_plugin/deprecated/lib.rs b/src/librustc_plugin/deprecated/lib.rs index 5fb18066759..1d0afe84c25 100644 --- a/src/librustc_plugin/deprecated/lib.rs +++ b/src/librustc_plugin/deprecated/lib.rs @@ -1,6 +1,6 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(staged_api)] -#![unstable(feature = "rustc_plugin", issue = "29597")] +#![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")] |