Skip to content
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

rust_analyzer_settings: force use of 'nightly' toolchain #133712

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Dec 1, 2024

The cranelift folder contains a rust-toolchain file. That means when RA opens compiler/rustc_codegen_cranelift/Cargo.toml, it will try to use that toolchain or fail. (Maybe that toolchain gets auto-installed for others? On my system, it just fails, but I also run vscodium in a sandbox.)

However, it shouldn't be necessary to use more than one toolchain for the rustc workspace. So we can set the RUSTUP_TOOLCHAIN variable on the server side to force the same toolchain to be used everywhere.

Suggested by @ChayimFriedman2 in rust-lang/rust-analyzer#18585.

@rustbot
Copy link
Collaborator

rustbot commented Dec 1, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 1, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Dec 1, 2024

Not sure who's generally in charge of these editor settings, Cc @lnicola @Veykril

@rust-log-analyzer

This comment has been minimized.

@RalfJung RalfJung force-pushed the rust_analyzer_settings branch from 7523152 to fd13717 Compare December 1, 2024 21:54
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Dec 1, 2024
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks. I believe bootstrap maintains these.

@jieyouxu
Copy link
Member

jieyouxu commented Dec 2, 2024

r? jieyouxu @bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 2, 2024

📌 Commit fd13717 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 2, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 2, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#131416 (Mark `slice::copy_from_slice` unstably const)
 - rust-lang#131784 (Stabilize unsigned and float variants of `num_midpoint` feature)
 - rust-lang#133446 (coverage: Use a query to identify which counter/expression IDs are used)
 - rust-lang#133711 (add isatty doc alias for `is_terminal`)
 - rust-lang#133712 (rust_analyzer_settings: force use of 'nightly' toolchain)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 76183a5 into rust-lang:master Dec 2, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 2, 2024
Rollup merge of rust-lang#133712 - RalfJung:rust_analyzer_settings, r=jieyouxu

rust_analyzer_settings: force use of 'nightly' toolchain

The cranelift folder contains a rust-toolchain file. That means when RA opens `compiler/rustc_codegen_cranelift/Cargo.toml`, it will try to use that toolchain or fail. (Maybe that toolchain gets auto-installed for others? On my system, it just fails, but I also run vscodium in a sandbox.)

However, it shouldn't be necessary to use more than one toolchain for the rustc workspace. So we can set the `RUSTUP_TOOLCHAIN` variable on the server side to force the same toolchain to be used everywhere.

Suggested by `@ChayimFriedman2` in rust-lang/rust-analyzer#18585.
@rustbot rustbot added this to the 1.85.0 milestone Dec 2, 2024
@RalfJung RalfJung deleted the rust_analyzer_settings branch December 2, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants