From 730470c8dd9b605333f84119e501193d06966528 Mon Sep 17 00:00:00 2001
From: clubby789 <jamie@hill-daniel.co.uk>
Date: Wed, 8 Feb 2023 22:38:20 +0000
Subject: [PATCH] Set `rust-analyzer.check.invocationLocation` to `root`

---
 src/bootstrap/setup.rs       | 8 +++++---
 src/etc/vscode_settings.json | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs
index c98a52450849e..2b613ad50ee48 100644
--- a/src/bootstrap/setup.rs
+++ b/src/bootstrap/setup.rs
@@ -24,10 +24,12 @@ pub enum Profile {
 }
 
 /// A list of historical hashes of `src/etc/vscode_settings.json`.
-/// New entries should be appended whenever this is updated so we can detected
+/// New entries should be appended whenever this is updated so we can detect
 /// outdated vs. user-modified settings files.
-static SETTINGS_HASHES: &[&str] =
-    &["ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8"];
+static SETTINGS_HASHES: &[&str] = &[
+    "ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8",
+    "56e7bf011c71c5d81e0bf42e84938111847a810eee69d906bba494ea90b51922",
+];
 static VSCODE_SETTINGS: &str = include_str!("../etc/vscode_settings.json");
 
 impl Profile {
diff --git a/src/etc/vscode_settings.json b/src/etc/vscode_settings.json
index cd61a38c5da98..04c34ce91c0b7 100644
--- a/src/etc/vscode_settings.json
+++ b/src/etc/vscode_settings.json
@@ -1,4 +1,6 @@
 {
+    "rust-analyzer.check.invocationLocation": "root",
+    "rust-analyzer.check.invocationStrategy": "once",
     "rust-analyzer.checkOnSave.overrideCommand": [
         "python3",
         "x.py",