Skip to content

Commit e36673f

Browse files
Rollup merge of #107819 - clubby789:x-py-root, r=jyn514
Set `rust-analyzer.check.invocationLocation` to `root` Add ```json "rust-analyzer.check.invocationLocation": "root", "rust-analyzer.check.invocationStrategy": "once", ``` to the bundled VS code config. This prevents an error with r-a invoking `python3 x.py` in `src/bootstrap` where `x.py` does not exist. r? `@jyn514`
2 parents 6905d2c + 730470c commit e36673f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/bootstrap/setup.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ pub enum Profile {
2424
}
2525

2626
/// A list of historical hashes of `src/etc/vscode_settings.json`.
27-
/// New entries should be appended whenever this is updated so we can detected
27+
/// New entries should be appended whenever this is updated so we can detect
2828
/// outdated vs. user-modified settings files.
29-
static SETTINGS_HASHES: &[&str] =
30-
&["ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8"];
29+
static SETTINGS_HASHES: &[&str] = &[
30+
"ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8",
31+
"56e7bf011c71c5d81e0bf42e84938111847a810eee69d906bba494ea90b51922",
32+
];
3133
static VSCODE_SETTINGS: &str = include_str!("../etc/vscode_settings.json");
3234

3335
impl Profile {

src/etc/vscode_settings.json

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"rust-analyzer.check.invocationLocation": "root",
3+
"rust-analyzer.check.invocationStrategy": "once",
24
"rust-analyzer.checkOnSave.overrideCommand": [
35
"python3",
46
"x.py",

0 commit comments

Comments
 (0)