Skip to content

⬆️ rust-analyzer #1

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.

Sign up for GitHub

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

Closed
fasterthanlime wants to merge 2 commits into from
Closed

⬆️ rust-analyzer #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f37325
:up_arrow: rust-analyzer
fasterthanlime Jul 19, 2022
9c766ad
Set CARGO_WORKSPACE_DIR directly in `prepare_tool_cargo`
fasterthanlime Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/bootstrap/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,10 @@ pub fn prepare_tool_cargo(
}
}

// cargo doesn't set this env var yet, but it's needed by expect-test
// to build correct absolute paths for test_data files
cargo.env("CARGO_WORKSPACE_DIR", &dir);
Copy link
Copy Markdown
Owner

@cuviper cuviper Jul 19, 2022

Choose a reason for hiding this comment

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

Since this is a non-standard thing, maybe we should only set that in test::RustAnalyzer? And even if it becomes standard, other crates in the tree might actually want the overall rust workspace root.

Copy link
Copy Markdown
Author

@fasterthanlime fasterthanlime Jul 19, 2022

Choose a reason for hiding this comment

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

That's a great point, that's an easy change to make — I'll do that for the final PR


// clippy tests need to know about the stage sysroot. Set them consistently while building to
// avoid rebuilding when running tests.
cargo.env("SYSROOT", builder.sysroot(compiler));
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer
Open in desktop
Submodule rust-analyzer updated from 5342f4 to 7d20ff