diff options
| author | bors <bors@rust-lang.org> | 2024-12-02 05:18:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-02 05:18:09 +0000 |
| commit | caa81728c37f5ccfa9a0979574b9272a67f8a286 (patch) | |
| tree | 99203dee6dd56d84f2b267f56f3e50d1103f46a9 /src | |
| parent | a522d78598415cdd614ccc6d961160f192f64b5c (diff) | |
| parent | 76183a53ed49264769c1e27296eee6115a1e43c1 (diff) | |
| download | rust-caa81728c37f5ccfa9a0979574b9272a67f8a286.tar.gz rust-caa81728c37f5ccfa9a0979574b9272a67f8a286.zip | |
Auto merge of #133723 - jhpratt:rollup-pyfespf, r=jhpratt
Rollup of 5 pull requests Successful merges: - #131416 (Mark `slice::copy_from_slice` unstably const) - #131784 (Stabilize unsigned and float variants of `num_midpoint` feature) - #133446 (coverage: Use a query to identify which counter/expression IDs are used) - #133711 (add isatty doc alias for `is_terminal`) - #133712 (rust_analyzer_settings: force use of 'nightly' toolchain) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/setup.rs | 1 | ||||
| -rw-r--r-- | src/etc/rust_analyzer_settings.json | 3 |
2 files changed, 4 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", diff --git a/src/etc/rust_analyzer_settings.json b/src/etc/rust_analyzer_settings.json index d1b186fd316..b104356d44c 100644 --- a/src/etc/rust_analyzer_settings.json +++ b/src/etc/rust_analyzer_settings.json @@ -34,5 +34,8 @@ "rust-analyzer.rustc.source": "./Cargo.toml", "rust-analyzer.cargo.extraEnv": { "RUSTC_BOOTSTRAP": "1" + }, + "rust-analyzer.server.extraEnv": { + "RUSTUP_TOOLCHAIN": "nightly" } } |