Skip to content

internal: Remove rust-analyzer.cargo.sysrootQueryMetadata config again #18788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Dec 29, 2024

Closes #18590

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 29, 2024
);
let mut sysroot =
Sysroot::new(project_json.sysroot.clone(), project_json.sysroot_src.clone());
sysroot.load_workspace(&SysrootSourceWorkspaceConfig::Stitched);
Copy link
Member Author

Choose a reason for hiding this comment

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

Notable behavior change is here, we only stitch the sourceroot workspace for rust-project.json as we cannot assume a cargo to be present here. Ultimately, rust-project.json should supply the stitched sysroot workspace.

@Veykril
Copy link
Member Author

Veykril commented Dec 29, 2024

Ideally the rust-project.json will actually list the sysroot workspace (that is, it provides a stitched one), so that will need some adjustments to the json format.

@Veykril
Copy link
Member Author

Veykril commented Dec 31, 2024

A thought for a follow up to this PR, we should be able to cache the fetched sysroot and re-use it between multiple workspaces.

Copy link
Contributor

@darichey darichey left a comment

Choose a reason for hiding this comment

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

Thanks, this looks good for our use case :)

@Veykril Veykril enabled auto-merge January 7, 2025 12:59
@Veykril Veykril force-pushed the push-zxystwnotuvq branch from a1f3b69 to f1c0d17 Compare January 7, 2025 13:00
@Veykril Veykril added this pull request to the merge queue Jan 7, 2025
Merged via the queue into rust-lang:master with commit 86d35a5 Jan 7, 2025
9 checks passed
@Veykril Veykril deleted the push-zxystwnotuvq branch January 7, 2025 13:29
@lnicola lnicola changed the title Remove rust-analyzer.cargo.sysrootQueryMetadata config again internal: Remove rust-analyzer.cargo.sysrootQueryMetadata config again Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Drop rust-analyzer.cargo.sysrootQueryMetadata and support for stitched sysroot workspace
3 participants