From 8458c6adb131345dbf0b48e23c8d220dc41c19fd Mon Sep 17 00:00:00 2001
From: jyn <github@jyn.dev>
Date: Fri, 26 May 2023 12:08:58 -0500
Subject: [PATCH] Add other workspaces to `linkedProjects` in
`rust_analyzer_settings.json`
This makes go-to-definition, etc. work in cg_clif, cg_gcc, rust-analyzer, and src/tools/x.
---
src/bootstrap/setup.rs | 1 +
src/etc/rust_analyzer_settings.json | 9 ++++++++-
src/tools/x/Cargo.lock | 4 +++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs
index 09f26862b4ab2..606a064bf6d20 100644
--- a/src/bootstrap/setup.rs
+++ b/src/bootstrap/setup.rs
@@ -31,6 +31,7 @@ static SETTINGS_HASHES: &[&str] = &[
"ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8",
"56e7bf011c71c5d81e0bf42e84938111847a810eee69d906bba494ea90b51922",
"af1b5efe196aed007577899db9dae15d6dbc923d6fa42fa0934e68617ba9bbe0",
+ "3468fea433c25fff60be6b71e8a215a732a7b1268b6a83bf10d024344e140541",
];
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 dd01bfaa7252d..d9c4645f0b3b7 100644
--- a/src/etc/rust_analyzer_settings.json
+++ b/src/etc/rust_analyzer_settings.json
@@ -7,7 +7,14 @@
"check",
"--json-output"
],
- "rust-analyzer.linkedProjects": ["src/bootstrap/Cargo.toml", "Cargo.toml"],
+ "rust-analyzer.linkedProjects": [
+ "Cargo.toml",
+ "src/tools/x/Cargo.toml",
+ "src/bootstrap/Cargo.toml",
+ "src/tools/rust-analyzer/Cargo.toml",
+ "compiler/rustc_codegen_cranelift/Cargo.toml",
+ "compiler/rustc_codegen_gcc/Cargo.toml"
+ ],
"rust-analyzer.rustfmt.overrideCommand": [
"./build/host/rustfmt/bin/rustfmt",
"--edition=2021"
diff --git a/src/tools/x/Cargo.lock b/src/tools/x/Cargo.lock
index 723d6cb25ed6a..09e5c7507490d 100644
--- a/src/tools/x/Cargo.lock
+++ b/src/tools/x/Cargo.lock
@@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+version = 3
+
[[package]]
name = "x"
-version = "0.1.0"
+version = "0.1.1"