Skip to content

Commit

Permalink
Merge pull request #19150 from darichey/set-test-json-project
Browse files Browse the repository at this point in the history 
Apply cfg.setTest to json projects
  • Loading branch information
@Veykril
Veykril authored Feb 13, 2025
2 parents c661e5e + a297d43 commit c63ef62
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 44 deletions.
5 changes: 3 additions & 2 deletions crates/project-model/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ fn load_workspace_from_metadata(file: &str) -> ProjectWorkspace {
build_scripts: WorkspaceBuildScripts::default(),
rustc: Err(None),
error: None,
set_test: true,
},
cfg_overrides: Default::default(),
sysroot: Sysroot::empty(),
rustc_cfg: Vec::new(),
toolchain: None,
target_layout: Err("target_data_layout not loaded".into()),
extra_includes: Vec::new(),
set_test: true,
}
}

Expand All @@ -65,6 +65,7 @@ fn load_rust_project(file: &str) -> (CrateGraph, ProcMacroPaths) {
target_layout: Err(Arc::from("test has no data layout")),
cfg_overrides: Default::default(),
extra_includes: Vec::new(),
set_test: true,
};
to_crate_graph(project_workspace, &mut Default::default())
}
Expand Down Expand Up @@ -285,14 +286,14 @@ fn smoke_test_real_sysroot_cargo() {
build_scripts: WorkspaceBuildScripts::default(),
rustc: Err(None),
error: None,
set_test: true,
},
sysroot,
rustc_cfg: Vec::new(),
cfg_overrides: Default::default(),
toolchain: None,
target_layout: Err("target_data_layout not loaded".into()),
extra_includes: Vec::new(),
set_test: true,
};
project_workspace.to_crate_graph(
&mut {
Expand Down
84 changes: 43 additions & 41 deletions crates/project-model/src/workspace.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ pub struct ProjectWorkspace {
pub cfg_overrides: CfgOverrides,
/// Additional includes to add for the VFS.
pub extra_includes: Vec<AbsPathBuf>,
/// Set `cfg(test)` for local crates
pub set_test: bool,
}

#[derive(Clone)]
Expand All @@ -79,7 +81,6 @@ pub enum ProjectWorkspaceKind {
/// The rustc workspace loaded for this workspace. An `Err(None)` means loading has been
/// disabled or was otherwise not requested.
rustc: Result<Box<(CargoWorkspace, WorkspaceBuildScripts)>, Option<String>>,
set_test: bool,
},
/// Project workspace was specified using a `rust-project.json` file.
Json(ProjectJson),
Expand All @@ -98,7 +99,6 @@ pub enum ProjectWorkspaceKind {
file: ManifestPath,
/// Is this file a cargo script file?
cargo: Option<(CargoWorkspace, WorkspaceBuildScripts, Option<Arc<anyhow::Error>>)>,
set_test: bool,
},
}

Expand All @@ -113,9 +113,10 @@ impl fmt::Debug for ProjectWorkspace {
target_layout,
cfg_overrides,
extra_includes,
set_test,
} = self;
match kind {
ProjectWorkspaceKind::Cargo { cargo, error: _, build_scripts, rustc, set_test } => f
ProjectWorkspaceKind::Cargo { cargo, error: _, build_scripts, rustc } => f
.debug_struct("Cargo")
.field("root", &cargo.workspace_root().file_name())
.field("n_packages", &cargo.packages().len())
Expand All @@ -141,11 +142,12 @@ impl fmt::Debug for ProjectWorkspace {
.field("toolchain", &toolchain)
.field("data_layout", &target_layout)
.field("n_cfg_overrides", &cfg_overrides.len())
.field("n_extra_includes", &extra_includes.len());
.field("n_extra_includes", &extra_includes.len())
.field("set_test", set_test);

debug_struct.finish()
}
ProjectWorkspaceKind::DetachedFile { file, cargo: cargo_script, set_test } => f
ProjectWorkspaceKind::DetachedFile { file, cargo: cargo_script } => f
.debug_struct("DetachedFiles")
.field("file", &file)
.field("cargo_script", &cargo_script.is_some())
Expand Down Expand Up @@ -386,14 +388,14 @@ impl ProjectWorkspace {
build_scripts: WorkspaceBuildScripts::default(),
rustc,
error: error.map(Arc::new),
set_test: *set_test,
},
sysroot,
rustc_cfg,
cfg_overrides: cfg_overrides.clone(),
toolchain,
target_layout: data_layout.map(Arc::from).map_err(|it| Arc::from(it.to_string())),
extra_includes: extra_includes.clone(),
set_test: *set_test,
})
}

Expand Down Expand Up @@ -449,6 +451,7 @@ impl ProjectWorkspace {
target_layout: target_layout.map(Arc::from).map_err(|it| Arc::from(it.to_string())),
cfg_overrides: config.cfg_overrides.clone(),
extra_includes: config.extra_includes.clone(),
set_test: config.set_test,
}
}

Expand Down Expand Up @@ -504,14 +507,14 @@ impl ProjectWorkspace {
kind: ProjectWorkspaceKind::DetachedFile {
file: detached_file.to_owned(),
cargo: cargo_script,
set_test: config.set_test,
},
sysroot,
rustc_cfg,
toolchain,
target_layout: data_layout.map(Arc::from).map_err(|it| Arc::from(it.to_string())),
cfg_overrides: config.cfg_overrides.clone(),
extra_includes: config.extra_includes.clone(),
set_test: config.set_test,
})
}

Expand Down Expand Up @@ -696,7 +699,7 @@ impl ProjectWorkspace {
.into_iter()
.chain(mk_sysroot())
.collect::<Vec<_>>(),
ProjectWorkspaceKind::Cargo { cargo, rustc, build_scripts, error: _, set_test: _ } => {
ProjectWorkspaceKind::Cargo { cargo, rustc, build_scripts, error: _ } => {
cargo
.packages()
.map(|pkg| {
Expand Down Expand Up @@ -831,8 +834,9 @@ impl ProjectWorkspace {
sysroot,
extra_env,
cfg_overrides,
self.set_test,
),
ProjectWorkspaceKind::Cargo { cargo, rustc, build_scripts, error: _, set_test } => {
ProjectWorkspaceKind::Cargo { cargo, rustc, build_scripts, error: _ } => {
cargo_to_crate_graph(
load,
rustc.as_ref().map(|a| a.as_ref()).ok(),
Expand All @@ -841,10 +845,10 @@ impl ProjectWorkspace {
rustc_cfg.clone(),
cfg_overrides,
build_scripts,
*set_test,
self.set_test,
)
}
ProjectWorkspaceKind::DetachedFile { file, cargo: cargo_script, set_test, .. } => {
ProjectWorkspaceKind::DetachedFile { file, cargo: cargo_script, .. } => {
if let Some((cargo, build_scripts, _)) = cargo_script {
cargo_to_crate_graph(
&mut |path| load(path),
Expand All @@ -854,7 +858,7 @@ impl ProjectWorkspace {
rustc_cfg.clone(),
cfg_overrides,
build_scripts,
*set_test,
self.set_test,
)
} else {
detached_file_to_crate_graph(
Expand All @@ -863,7 +867,7 @@ impl ProjectWorkspace {
file,
sysroot,
cfg_overrides,
*set_test,
self.set_test,
)
}
}
Expand All @@ -885,34 +889,22 @@ impl ProjectWorkspace {
} = other;
(match (kind, o_kind) {
(
ProjectWorkspaceKind::Cargo {
cargo,
rustc,
build_scripts: _,
error: _,
set_test: _,
},
ProjectWorkspaceKind::Cargo { cargo, rustc, build_scripts: _, error: _ },
ProjectWorkspaceKind::Cargo {
cargo: o_cargo,
rustc: o_rustc,
build_scripts: _,
error: _,
set_test: _,
},
) => cargo == o_cargo && rustc == o_rustc,
(ProjectWorkspaceKind::Json(project), ProjectWorkspaceKind::Json(o_project)) => {
project == o_project
}
(
ProjectWorkspaceKind::DetachedFile {
file,
cargo: Some((cargo_script, _, _)),
set_test: _,
},
ProjectWorkspaceKind::DetachedFile { file, cargo: Some((cargo_script, _, _)) },
ProjectWorkspaceKind::DetachedFile {
file: o_file,
cargo: Some((o_cargo_script, _, _)),
set_test: _,
},
) => file == o_file && cargo_script == o_cargo_script,
_ => return false,
Expand Down Expand Up @@ -940,13 +932,13 @@ fn project_json_to_crate_graph(
sysroot: &Sysroot,
extra_env: &FxHashMap<String, String>,
override_cfg: &CfgOverrides,
set_test: bool,
) -> (CrateGraph, ProcMacroPaths) {
let mut res = (CrateGraph::default(), ProcMacroPaths::default());
let (crate_graph, proc_macros) = &mut res;
let (public_deps, libproc_macro) =
sysroot_to_crate_graph(crate_graph, sysroot, rustc_cfg.clone(), load);

let r_a_cfg_flag = CfgAtom::Flag(sym::rust_analyzer.clone());
let mut cfg_cache: FxHashMap<&str, Vec<CfgAtom>> = FxHashMap::default();

let idx_to_crate_id: FxHashMap<CrateArrayIdx, CrateId> = project
Expand All @@ -965,6 +957,7 @@ fn project_json_to_crate_graph(
proc_macro_dylib_path,
is_proc_macro,
repository,
is_workspace_member,
..
},
file_id,
Expand All @@ -982,19 +975,28 @@ fn project_json_to_crate_graph(
None => &rustc_cfg,
};

let mut cfg_options = target_cfgs
.iter()
.chain(cfg.iter())
.chain(iter::once(&r_a_cfg_flag))
.cloned()
.collect();
override_cfg.apply(
&mut cfg_options,
display_name
.as_ref()
.map(|it| it.canonical_name().as_str())
.unwrap_or_default(),
);
let cfg_options = {
let mut cfg_options: CfgOptions =
target_cfgs.iter().chain(cfg.iter()).cloned().collect();

if *is_workspace_member {
if set_test {
// Add test cfg for local crates
cfg_options.insert_atom(sym::test.clone());
}
cfg_options.insert_atom(sym::rust_analyzer.clone());
}

override_cfg.apply(
&mut cfg_options,
display_name
.as_ref()
.map(|it| it.canonical_name().as_str())
.unwrap_or_default(),
);
cfg_options
};

let crate_graph_crate_id = crate_graph.add_crate_root(
file_id,
*edition,
Expand Down
2 changes: 2 additions & 0 deletions crates/project-model/test_data/output/rust_project_cfg_groups.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@
"group1_other_cfg=other_config",
"group2_cfg=yet_another_config",
"rust_analyzer",
"test",
"true",
],
),
Expand Down Expand Up @@ -496,6 +497,7 @@
"group2_cfg=fourth_config",
"group2_cfg=yet_another_config",
"rust_analyzer",
"test",
"true",
"unrelated_cfg",
],
Expand Down
1 change: 1 addition & 0 deletions crates/project-model/test_data/output/rust_project_hello_world_project_model.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@
cfg_options: CfgOptions(
[
"rust_analyzer",
"test",
"true",
],
),
Expand Down
2 changes: 1 addition & 1 deletion crates/rust-analyzer/src/cli/rustc_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ impl Tester {
kind: ProjectWorkspaceKind::DetachedFile {
file: ManifestPath::try_from(tmp_file).unwrap(),
cargo: None,
set_test: true,
},
sysroot,
rustc_cfg: vec![],
toolchain: None,
target_layout: data_layout.map(Arc::from).map_err(|it| Arc::from(it.to_string())),
cfg_overrides: Default::default(),
extra_includes: vec![],
set_test: true,
};
let load_cargo_config = LoadCargoConfig {
load_out_dirs_from_check: false,
Expand Down

0 comments on commit c63ef62

Please sign in to comment.