Skip to content

Commit 5cdb866

Browse files
committed
Update rust-analyzer config
mod_bench no longer exists and there is no benefit to not having a sysroot available for mini_core and mini_core_hello_world.
1 parent 5d03df9 commit 5cdb866

File tree

2 files changed

+26
-32
lines changed

2 files changed

+26
-32
lines changed

.vscode/settings.json

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
{
22
"editor.formatOnSave": true,
3-
43
// in case rustc.source is disabled for performance reasons; disable the errors about this
5-
"rust-analyzer.diagnostics.disabled": ["unresolved-extern-crate", "unresolved-macro-call"],
4+
"rust-analyzer.diagnostics.disabled": [
5+
"unresolved-extern-crate",
6+
"unresolved-macro-call"
7+
],
68
"rust-analyzer.rustc.source": "discover",
79
"rust-analyzer.imports.granularity.enforce": true,
810
"rust-analyzer.imports.granularity.group": "module",
911
"rust-analyzer.imports.prefix": "crate",
10-
"rust-analyzer.cargo.features": ["unstable-features"],
12+
"rust-analyzer.cargo.features": [
13+
"unstable-features"
14+
],
1115
"rust-analyzer.linkedProjects": [
1216
"./Cargo.toml",
1317
"./build_system/Cargo.toml",
1418
{
19+
"sysroot_src": "./build/stdlib/library",
1520
"crates": [
1621
{
1722
"root_module": "./example/mini_core.rs",
18-
"edition": "2018",
23+
"edition": "2015",
1924
"deps": [],
2025
"cfg": [],
2126
},
2227
{
2328
"root_module": "./example/mini_core_hello_world.rs",
24-
"edition": "2018",
25-
"deps": [{ "crate": 0, "name": "mini_core" }],
26-
"cfg": [],
27-
},
28-
{
29-
"root_module": "./example/mod_bench.rs",
30-
"edition": "2018",
31-
"deps": [],
29+
"edition": "2015",
30+
"deps": [
31+
{
32+
"crate": 0,
33+
"name": "mini_core"
34+
}
35+
],
3236
"cfg": [],
3337
},
34-
]
35-
},
36-
{
37-
"sysroot_src": "./build/stdlib/library",
38-
"crates": [
3938
{
4039
"root_module": "./example/std_example.rs",
4140
"edition": "2015",

.zed/settings.json

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"initialization_options": {
66
"diagnostics": {
77
// in case rustc.source is disabled for performance reasons; disable the errors about this
8-
"disabled": ["unresolved-extern-crate", "unresolved-macro-call"]
8+
"disabled": [
9+
"unresolved-extern-crate",
10+
"unresolved-macro-call"
11+
]
912
},
1013
"rustc": {
1114
"source": "discover"
@@ -18,22 +21,25 @@
1821
"prefix": "crate"
1922
},
2023
"cargo": {
21-
"features": ["unstable-features"]
24+
"features": [
25+
"unstable-features"
26+
]
2227
},
2328
"linkedProjects": [
2429
"./Cargo.toml",
2530
"./build_system/Cargo.toml",
2631
{
32+
"sysroot_src": "./build/stdlib/library",
2733
"crates": [
2834
{
2935
"root_module": "./example/mini_core.rs",
30-
"edition": "2018",
36+
"edition": "2015",
3137
"deps": [],
3238
"cfg": []
3339
},
3440
{
3541
"root_module": "./example/mini_core_hello_world.rs",
36-
"edition": "2018",
42+
"edition": "2015",
3743
"deps": [
3844
{
3945
"crate": 0,
@@ -42,17 +48,6 @@
4248
],
4349
"cfg": []
4450
},
45-
{
46-
"root_module": "./example/mod_bench.rs",
47-
"edition": "2018",
48-
"deps": [],
49-
"cfg": []
50-
}
51-
]
52-
},
53-
{
54-
"sysroot_src": "./build/stdlib/library",
55-
"crates": [
5651
{
5752
"root_module": "./example/std_example.rs",
5853
"edition": "2015",

0 commit comments

Comments
 (0)