Skip to content

Always use crates from sysroot in proc-macro-srv#22500

Merged
Veykril merged 2 commits into
rust-lang:masterfrom
bjorn3:proc-macro-srv_sysroot_crates
May 31, 2026
Merged

Always use crates from sysroot in proc-macro-srv#22500
Veykril merged 2 commits into
rust-lang:masterfrom
bjorn3:proc-macro-srv_sysroot_crates

Conversation

@bjorn3

@bjorn3 bjorn3 commented May 31, 2026

Copy link
Copy Markdown
Member

Unlike the rest of rust-analyzer it only compiles on nightly anyway. And this makes it easier to add dependencies on other rustc crates like rustc_metadata for parsing crate metadata in the future.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2026
@bjorn3 bjorn3 added the A-proc-macro proc macro label May 31, 2026
@bjorn3 bjorn3 force-pushed the proc-macro-srv_sysroot_crates branch from 3796fdc to 54850f2 Compare May 31, 2026 11:24
bjorn3 added 2 commits May 31, 2026 13:28
Unlike the rest of rust-analyzer it only compiles on nightly anyway. And
this makes it easier to add dependencies on other rustc crates like
rustc_metadata for parsing crate metadata in the future.

Install rustc-dev for nightly toolchain
@bjorn3 bjorn3 force-pushed the proc-macro-srv_sysroot_crates branch from 54850f2 to 2ce4468 Compare May 31, 2026 11:28
@bjorn3

bjorn3 commented May 31, 2026

Copy link
Copy Markdown
Member Author

By the way I noticed that the proc-macro-srv tests are broken unless the span/salsa feature is enabled.

@Veykril

Veykril commented May 31, 2026

Copy link
Copy Markdown
Member

By the way I noticed that the proc-macro-srv tests are broken unless the span/salsa feature is enabled.

Do we not run these on ci? 😱

@Veykril Veykril left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Veykril Veykril added this pull request to the merge queue May 31, 2026
@bjorn3

bjorn3 commented May 31, 2026

Copy link
Copy Markdown
Member Author

In the configuration we run these tests, feature unification enables the salsa feature.

Merged via the queue into rust-lang:master with commit 8c12600 May 31, 2026
18 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2026
@bjorn3 bjorn3 deleted the proc-macro-srv_sysroot_crates branch June 2, 2026 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-proc-macro proc macro

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants