diff options
| author | bors <bors@rust-lang.org> | 2025-05-29 12:07:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-29 12:07:53 +0000 |
| commit | 13718eb788622ef8c998650451174570230d2971 (patch) | |
| tree | caa9ae4aa30d982c3f7fb0b48d14a8d15a3ce135 /Cargo.lock | |
| parent | 8afd71079a729ac002298239f5010ccaac5807ca (diff) | |
| parent | 026baa1c6fb397e9bd2c171d750c939232c13a58 (diff) | |
| download | rust-13718eb788622ef8c998650451174570230d2971.tar.gz rust-13718eb788622ef8c998650451174570230d2971.zip | |
Auto merge of #141595 - bjorn3:rustc_no_sysroot_proc_macro, r=onur-ozkan
Do not get proc_macro from the sysroot in rustc With the stage0 refactor the proc_macro version found in the sysroot will no longer always match the proc_macro version that proc-macros get compiled with by the rustc executable that uses this proc_macro. This will cause problems as soon as the ABI of the bridge gets changed to implement new features or change the way existing features work. To fix this, this commit changes rustc crates to depend directly on the local version of proc_macro which will also be used in the sysroot that rustc will build.
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index c309f10997c..1bfef8a9860 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3445,6 +3445,7 @@ dependencies = [ "rustc_macros", "rustc_parse", "rustc_parse_format", + "rustc_proc_macro", "rustc_session", "rustc_span", "rustc_target", @@ -3734,6 +3735,7 @@ dependencies = [ "rustc_lint_defs", "rustc_macros", "rustc_parse", + "rustc_proc_macro", "rustc_serialize", "rustc_session", "rustc_span", @@ -4082,6 +4084,7 @@ dependencies = [ "rustc_index", "rustc_macros", "rustc_middle", + "rustc_proc_macro", "rustc_serialize", "rustc_session", "rustc_span", @@ -4339,6 +4342,13 @@ dependencies = [ ] [[package]] +name = "rustc_proc_macro" +version = "0.0.0" +dependencies = [ + "rustc-literal-escaper", +] + +[[package]] name = "rustc_query_impl" version = "0.0.0" dependencies = [ |