about summary refs log tree commit diff
path: root/editors/code
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-04-19 16:00:54 +0000
committerbors <bors@rust-lang.org>2024-04-19 16:00:54 +0000
commit50bdeaad07f1f052d1c6fc4d504a8b5f01596ec0 (patch)
tree876e094e8da39bb5db0a68e89b9c79a26ff198a1 /editors/code
parent05428c56404a7751f3bd6cb61d739a8249f01ebc (diff)
parentcdb8c3a3279d0ac6fcc4571fdd79bbe91849f4c9 (diff)
downloadrust-50bdeaad07f1f052d1c6fc4d504a8b5f01596ec0.tar.gz
rust-50bdeaad07f1f052d1c6fc4d504a8b5f01596ec0.zip
Auto merge of #17108 - Veykril:rustc-ws-hacks, r=Veykril
internal: Cleanup cfg and env handling in project-model

Fixes https://github.com/rust-lang/rust-analyzer/issues/16122#issuecomment-2065794340

`miri` and `debug_assertions` are now enabled via the `cargo.cfgs` config by default, allowing them to be disabled by overwriting the config.
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index a6d21cbf583..389e1b8742c 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -610,7 +610,10 @@
                 },
                 "rust-analyzer.cargo.cfgs": {
                     "markdownDescription": "List of cfg options to enable with the given values.",
-                    "default": {},
+                    "default": {
+                        "debug_assertions": null,
+                        "miri": null
+                    },
                     "type": "object"
                 },
                 "rust-analyzer.cargo.extraArgs": {