Skip to content

Commit ea8b4ff

Browse files
authored
Rollup merge of #111998 - jyn514:ra-dogfooding, r=Mark-Simulacrum
Add other workspaces to `linkedProjects` in rust_analyzer_settings This makes go-to-definition, etc. work in cg_clif, cg_gcc, rust-analyzer, and src/tools/x.
2 parents 95b909a + 8458c6a commit ea8b4ff

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

src/bootstrap/setup.rs

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ static SETTINGS_HASHES: &[&str] = &[
3131
"ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8",
3232
"56e7bf011c71c5d81e0bf42e84938111847a810eee69d906bba494ea90b51922",
3333
"af1b5efe196aed007577899db9dae15d6dbc923d6fa42fa0934e68617ba9bbe0",
34+
"3468fea433c25fff60be6b71e8a215a732a7b1268b6a83bf10d024344e140541",
3435
];
3536
static RUST_ANALYZER_SETTINGS: &str = include_str!("../etc/rust_analyzer_settings.json");
3637

src/etc/rust_analyzer_settings.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
"check",
88
"--json-output"
99
],
10-
"rust-analyzer.linkedProjects": ["src/bootstrap/Cargo.toml", "Cargo.toml"],
10+
"rust-analyzer.linkedProjects": [
11+
"Cargo.toml",
12+
"src/tools/x/Cargo.toml",
13+
"src/bootstrap/Cargo.toml",
14+
"src/tools/rust-analyzer/Cargo.toml",
15+
"compiler/rustc_codegen_cranelift/Cargo.toml",
16+
"compiler/rustc_codegen_gcc/Cargo.toml"
17+
],
1118
"rust-analyzer.rustfmt.overrideCommand": [
1219
"./build/host/rustfmt/bin/rustfmt",
1320
"--edition=2021"

src/tools/x/Cargo.lock

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# This file is automatically @generated by Cargo.
22
# It is not intended for manual editing.
3+
version = 3
4+
35
[[package]]
46
name = "x"
5-
version = "0.1.0"
7+
version = "0.1.1"

0 commit comments

Comments
 (0)