language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove patch sysroot cfg-if hack

Browse source
This commit is contained in:
Lukas Wirth 2024-12-09 11:42:51 +01:00
parent 1c3043bc8c
commit 7085328185
2 changed files with 18 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crates/project-model/src/workspace.rs
View file

@ -747,17 +747,14 @@ impl ProjectWorkspace {
let _p = tracing::info_span!("ProjectWorkspace::to_crate_graph").entered();
let Self { kind, sysroot, cfg_overrides, rustc_cfg, .. } = self;
let ((mut crate_graph, proc_macros), sysroot) = match kind {
ProjectWorkspaceKind::Json(project) => (
project_json_to_crate_graph(
rustc_cfg.clone(),
load,
project,
sysroot,
extra_env,
cfg_overrides,
),
let (crate_graph, proc_macros) = match kind {
ProjectWorkspaceKind::Json(project) => project_json_to_crate_graph(
rustc_cfg.clone(),
load,
project,
sysroot,
extra_env,
cfg_overrides,
),
ProjectWorkspaceKind::Cargo {
cargo,
@ -766,20 +763,17 @@ impl ProjectWorkspace {
cargo_config_extra_env: _,
error: _,
set_test,
} => (
cargo_to_crate_graph(
load,
rustc.as_ref().map(|a| a.as_ref()).ok(),
cargo,
sysroot,
rustc_cfg.clone(),
cfg_overrides,
build_scripts,
*set_test,
),
} => cargo_to_crate_graph(
load,
rustc.as_ref().map(|a| a.as_ref()).ok(),
cargo,
sysroot,
rustc_cfg.clone(),
cfg_overrides,
build_scripts,
*set_test,
),
ProjectWorkspaceKind::DetachedFile { file, cargo: cargo_script, set_test, .. } => (
ProjectWorkspaceKind::DetachedFile { file, cargo: cargo_script, set_test, .. } => {
if let Some((cargo, build_scripts, _)) = cargo_script {
cargo_to_crate_graph(
&mut |path| load(path),
@ -800,16 +794,10 @@ impl ProjectWorkspace {
cfg_overrides,
*set_test,
)
},
sysroot,
),
}
}
};
if matches!(sysroot.mode(), SysrootMode::Stitched(_)) && crate_graph.patch_cfg_if() {
debug!("Patched std to depend on cfg-if")
} else {
debug!("Did not patch std to depend on cfg-if")
}
(crate_graph, proc_macros)
}