about summary refs log tree commit diff
path: root/crates/rust-analyzer/src/cli/rustc_tests.rs
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 /crates/rust-analyzer/src/cli/rustc_tests.rs
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 'crates/rust-analyzer/src/cli/rustc_tests.rs')
-rw-r--r--crates/rust-analyzer/src/cli/rustc_tests.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/rust-analyzer/src/cli/rustc_tests.rs b/crates/rust-analyzer/src/cli/rustc_tests.rs
index eeec13a14be..548dd4e70e5 100644
--- a/crates/rust-analyzer/src/cli/rustc_tests.rs
+++ b/crates/rust-analyzer/src/cli/rustc_tests.rs
@@ -81,6 +81,7 @@ impl Tester {
             rustc_cfg: vec![],
             toolchain: None,
             target_layout: data_layout.map(Arc::from).map_err(|it| Arc::from(it.to_string())),
+            cfg_overrides: Default::default(),
         };
         let load_cargo_config = LoadCargoConfig {
             load_out_dirs_from_check: false,