diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-31 22:49:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 22:49:50 +0200 |
| commit | 82c50ce97f8b9ad9411590fc8a98e837bf47e616 (patch) | |
| tree | fefc78939d3cacdf991f991000df45a9127e6d35 | |
| parent | 93d65adb3655eb26364f2925f0fd9c92dc6f1b01 (diff) | |
| parent | a62e30ee3fadcf0b6f410c2868ac41a7621de5cc (diff) | |
| download | rust-82c50ce97f8b9ad9411590fc8a98e837bf47e616.tar.gz rust-82c50ce97f8b9ad9411590fc8a98e837bf47e616.zip | |
Rollup merge of #113906 - notriddle:notriddle/cargo-extra-env, r=Mark-Simulacrum
etc: add `RUSTC_BOOTSTRAP` to rust-analyzer config Fixes the problem reported in https://github.com/rust-lang/rust/issues/112391#issuecomment-1597224941
| -rw-r--r-- | src/bootstrap/setup.rs | 1 | ||||
| -rw-r--r-- | src/etc/rust_analyzer_settings.json | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index e3ab890a434..30730f50491 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -32,6 +32,7 @@ static SETTINGS_HASHES: &[&str] = &[ "56e7bf011c71c5d81e0bf42e84938111847a810eee69d906bba494ea90b51922", "af1b5efe196aed007577899db9dae15d6dbc923d6fa42fa0934e68617ba9bbe0", "3468fea433c25fff60be6b71e8a215a732a7b1268b6a83bf10d024344e140541", + "47d227f424bf889b0d899b9cc992d5695e1b78c406e183cd78eafefbe5488923", ]; static RUST_ANALYZER_SETTINGS: &str = include_str!("../etc/rust_analyzer_settings.json"); diff --git a/src/etc/rust_analyzer_settings.json b/src/etc/rust_analyzer_settings.json index d9c4645f0b3..6e5e2c35005 100644 --- a/src/etc/rust_analyzer_settings.json +++ b/src/etc/rust_analyzer_settings.json @@ -31,5 +31,8 @@ "--json-output" ], "rust-analyzer.cargo.sysrootSrc": "./library", - "rust-analyzer.rustc.source": "./Cargo.toml" + "rust-analyzer.rustc.source": "./Cargo.toml", + "rust-analyzer.cargo.extraEnv": { + "RUSTC_BOOTSTRAP": "1" + } } |