Skip to content

Commit cadf6b9

Browse files
authored
Rollup merge of rust-lang#63736 - SimonSapin:plugin, r=eddyb
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)
2 parents 3662a9f + c561abe commit cadf6b9

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

Cargo.lock

+8
Original file line numberDiff line numberDiff line change
@@ -3189,6 +3189,7 @@ dependencies = [
31893189
"rustc_interface",
31903190
"rustc_metadata",
31913191
"rustc_mir",
3192+
"rustc_plugin",
31923193
"rustc_plugin_impl",
31933194
"rustc_save_analysis",
31943195
"rustc_target",
@@ -3372,6 +3373,13 @@ dependencies = [
33723373
"syntax_pos",
33733374
]
33743375

3376+
[[package]]
3377+
name = "rustc_plugin"
3378+
version = "0.0.0"
3379+
dependencies = [
3380+
"rustc_plugin_impl",
3381+
]
3382+
33753383
[[package]]
33763384
name = "rustc_plugin_impl"
33773385
version = "0.0.0"

src/librustc_driver/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
2020
errors = { path = "../librustc_errors", package = "rustc_errors" }
2121
rustc_metadata = { path = "../librustc_metadata" }
2222
rustc_mir = { path = "../librustc_mir" }
23+
rustc_plugin = { path = "../librustc_plugin/deprecated" } # To get this in the sysroot
2324
rustc_plugin_impl = { path = "../librustc_plugin" }
2425
rustc_save_analysis = { path = "../librustc_save_analysis" }
2526
rustc_codegen_utils = { path = "../librustc_codegen_utils" }

src/librustc_plugin/deprecated/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
22
#![feature(staged_api)]
3-
#![unstable(feature = "rustc_plugin", issue = "29597")]
3+
#![unstable(feature = "rustc_private", issue = "27812")]
44
#![rustc_deprecated(since = "1.38.0", reason = "\
55
import this through `rustc_driver::plugin` instead to make TLS work correctly. \
66
See https://github.com/rust-lang/rust/issues/62717")]

0 commit comments

Comments
 (0)