diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2024-12-01 21:38:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-01 21:38:26 -0500 |
| commit | 76183a53ed49264769c1e27296eee6115a1e43c1 (patch) | |
| tree | 99203dee6dd56d84f2b267f56f3e50d1103f46a9 /src/bootstrap | |
| parent | 1391039fa763b517b04fa73df87bb9afdab7b1c3 (diff) | |
| parent | fd1371781540c3b58bb3ee0f0ce17ad134b11926 (diff) | |
| download | rust-76183a53ed49264769c1e27296eee6115a1e43c1.tar.gz rust-76183a53ed49264769c1e27296eee6115a1e43c1.zip | |
Rollup merge of #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 https://github.com/rust-lang/rust-analyzer/issues/18585.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/setup.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs index 704fa46ab1e..3a8f9e48c0d 100644 --- a/src/bootstrap/src/core/build_steps/setup.rs +++ b/src/bootstrap/src/core/build_steps/setup.rs @@ -572,6 +572,7 @@ Select which editor you would like to set up [default: None]: "; "828666b021d837a33e78d870b56d34c88a5e2c85de58b693607ec574f0c27000", "811fb3b063c739d261fd8590dd30242e117908f5a095d594fa04585daa18ec4d", "4eecb58a2168b252077369da446c30ed0e658301efe69691979d1ef0443928f4", + "c394386e6133bbf29ffd32c8af0bb3d4aac354cba9ee051f29612aa9350f8f8d", ], EditorKind::Emacs => vec![ "51068d4747a13732440d1a8b8f432603badb1864fa431d83d0fd4f8fa57039e0", |