internal: Extend CargoConfig.unset_test_crates

[regexident]

This is to allow for efficiently disabling #[cfg(test)] on all crates (by passing unset_test_crates: UnsetTestCrates::All) without having to first load the crate graph, when using rust-analyzer as a library.

(FYI: The change doesn't seem to be covered by any existing tests.)

[matklad]

We actually recently gained some initial testing infra in this area. You can start with the following to test the effect of overrides:

diff --git a/crates/project_model/src/tests.rs b/crates/project_model/src/tests.rs
index f2c998308..c61aec8d3 100644
--- a/crates/project_model/src/tests.rs
+++ b/crates/project_model/src/tests.rs
@@ -14,6 +14,10 @@ use crate::{
 };
 
 fn load_cargo(file: &str) -> CrateGraph {
+    load_cargo_with_overrides(file, CfgOverrides::default())
+}
+
+fn load_cargo_with_overrides(file: &str, cfg_overrides: CfgOverrides) -> CrateGraph {
     let meta = get_test_json_file(file);
     let cargo_workspace = CargoWorkspace::new(meta);
     let project_workspace = ProjectWorkspace::Cargo {
@@ -22,7 +26,7 @@ fn load_cargo(file: &str) -> CrateGraph {
         sysroot: None,
         rustc: None,
         rustc_cfg: Vec::new(),
-        cfg_overrides: CfgOverrides::default(),
+        cfg_overrides,
     };
     to_crate_graph(project_workspace)
 }

[matklad]

The impl looks good to me, but adding a test for some overrides and all overrides would be helpful!

[regexident]

Hey Aleksey,

I was hoping you [c/]would point towards the appropriate place for adding some tests, so this is perfect!

Running the test I did however realize that by introducing a possibly overlapping overrides (i.e. one could provide a wildcard override, as well as a named one) I was effectively violating the invariant of CfgDiff …

pub struct CfgDiff {
    // Invariants: No duplicates, no atom that's both in `enable` and `disable`.
    enable: Vec<CfgAtom>,
    disable: Vec<CfgAtom>,
}

… as now you could effectively have duplicates or even atoms in both, enable and disable. Just spread across two CfgDiff.

So I changed CfgOverrides to the following …

/// A set of cfg-overrides per crate.
///
/// `Wildcard(..)` is useful e.g. disabling `#[cfg(test)]` on all crates,
/// without having to first obtain a list of all crates.
#[derive(Debug, Clone, Eq, PartialEq)]
pub enum CfgOverrides {
    /// A single global set of overrides matching all crates.
    Wildcard(CfgDiff),
    /// A set of overrides matching specific crates.
    Selective(FxHashMap<String, CfgDiff>),
}

… to prevent that issue.

Let me know if you would like me to make any changes. :)

[matklad]

lgtm!

bors r+

[bors]

Build succeeded:

• Rust (macos-latest)
• Rust (ubuntu-latest)
• Rust (windows-latest)
• TypeScript (ubuntu-latest)
• TypeScript (windows-latest)