about summary refs log tree commit diff
path: root/docs
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 /docs
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 'docs')
-rw-r--r--docs/user/generated_config.adoc10
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index f20baee789d..a03ab0031d1 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc
@@ -88,10 +88,18 @@ or build-script sources change and are saved.
 Use `RUSTC_WRAPPER=rust-analyzer` when running build scripts to
 avoid checking unnecessary things.
 --
-[[rust-analyzer.cargo.cfgs]]rust-analyzer.cargo.cfgs (default: `{}`)::
+[[rust-analyzer.cargo.cfgs]]rust-analyzer.cargo.cfgs::
 +
 --
+Default:
+----
+{
+  "debug_assertions": null,
+  "miri": null
+}
+----
 List of cfg options to enable with the given values.
+
 --
 [[rust-analyzer.cargo.extraArgs]]rust-analyzer.cargo.extraArgs (default: `[]`)::
 +