language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Auto merge of #16726 - Veykril:rustc-ws-hacks, r=Veykril

Browse source 
internal: Remove rustc core test cfg hacks

cc https://github.com/rust-lang/rust-analyzer/issues/16538
This commit is contained in:
bors 2024-04-19 07:28:50 +00:00
commit eea61bd4d1
4 changed files with 14 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/rust-analyzer/src/config.rs
View file

@ -166,8 +166,6 @@ config_data! {
/// Set to `true` to use a subdirectory of the existing target directory or
/// set to a path relative to the workspace to use that path.
cargo_targetDir | rust_analyzerTargetDir: Option<TargetDirectory> = None,
/// Unsets the implicit `#[cfg(test)]` for the specified crates.
cargo_unsetTest: Vec<String> = vec!["core".to_owned()],
/// Run the check command for diagnostics on save.
checkOnSave | checkOnSave_enable: bool = true,
@ -1614,16 +1612,7 @@ impl Config {
vec![],
)
.unwrap(),
selective: self
.cargo_unsetTest()
.iter()
.map(|it| {
(
it.clone(),
CfgDiff::new(vec![], vec![CfgAtom::Flag("test".into())]).unwrap(),
)
})
.collect(),
selective: Default::default(),
},
wrap_rustc_in_build_scripts: *self.cargo_buildScripts_useRustcWrapper(),
invocation_strategy: match self.cargo_buildScripts_invocationStrategy() {