Skip to content

Commit

Permalink
Rollup merge of rust-lang#63736 - SimonSapin:plugin, r=eddyb
Browse files Browse the repository at this point in the history
Restore the rustc_plugin crate in the sysroot

It was accidentally removed in a rebase of rust-lang#62727

Fixes rust-lang#63729 (rls build failure)
  • Loading branch information
Centril committed Aug 20, 2019
2 parents 4563ff5 + c561abe commit 8369edb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
8 changes: 8 additions & 0 deletions Cargo.lock
Expand Up @@ -3189,6 +3189,7 @@ dependencies = [
"rustc_interface",
"rustc_metadata",
"rustc_mir",
"rustc_plugin",
"rustc_plugin_impl",
"rustc_save_analysis",
"rustc_target",
Expand Down Expand Up @@ -3372,6 +3373,13 @@ dependencies = [
"syntax_pos",
]

[[package]]
name = "rustc_plugin"
version = "0.0.0"
dependencies = [
"rustc_plugin_impl",
]

[[package]]
name = "rustc_plugin_impl"
version = "0.0.0"
Expand Down
1 change: 1 addition & 0 deletions src/librustc_driver/Cargo.toml
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion 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")]
Expand Down

0 comments on commit 8369edb

Please sign in to comment.