Rework WorkspaceMembers::new

Author: taiki-e

.github/.cspell/project-dictionary.txt

@@ -16,6 +16,8 @@ microkernel
 MSYSTEM
 nextest
 notcovered
+pkgid
+pkgname
 profdata
 profraw
 rmeta

CHANGELOG.md

@@ -12,6 +12,18 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+- Support glob pattern, versioned name with partial version or `<name>@<version>` syntax, and package spec in `--package`. Previously, only package name and versioned package name with `<name>:<full_version>` are supported. ([#476](https://github.com/taiki-e/cargo-llvm-cov/pull/476))
+
+  This also fixes regression introduced in 0.7.0 where causing packages specified with `--package` are wrongly excluded from report/test when package is specified with the above syntaxes.
+
+- Support glob pattern, versioned name, and package spec in `--exclude`. When we tested it previously, Cargo did not support this, but the current version of Cargo does support it. ([#476](https://github.com/taiki-e/cargo-llvm-cov/pull/476))
+
+- Align the exclusion behavior in reports when cargo-llvm-cov is performed in a sub-crate directory of a workspace or in the root crate of a non-virtual workspace without using `--workspace` or `--package`, to match the behavior when `--workspace` or `--package` is used (by default, only show the tested crates). ([#476](https://github.com/taiki-e/cargo-llvm-cov/pull/476))
+
+  Compatibility Note: When `--workspace` or `--package` is not used, this will exclude other untested workspace members from the report that were previously implicitly included.
+
+  If you want to test other workspace members, consider using `--workspace` or `--package`. If you don't want to test other workspace members but still want to include them in the report, consider using `--workspace` or `--exclude-from-test`.
+
 ## [0.7.1] - 2026-01-24
 
 - Fix regression introduced in 0.7.0 where causing coverage test failure in nextest's CI. ([6e30e6f](https://github.com/taiki-e/cargo-llvm-cov/commit/6e30e6f691e44a718fcb8dad7edb8bef3ab24307))

src/cargo.rs

@@ -10,7 +10,7 @@ use crate::{
     cli::{ManifestOptions, Subcommand},
     context::Context,
     env,
-    metadata::Metadata,
+    metadata::{Metadata, PackageId},
     process::ProcessBuilder,
 };
 
@@ -19,6 +19,7 @@ pub(crate) struct Workspace {
     pub(crate) config: Config,
     pub(crate) metadata: Metadata,
     pub(crate) current_manifest: Utf8PathBuf,
+    pub(crate) current_package: Option<PackageId>,
 
     pub(crate) target_dir: Utf8PathBuf,
     pub(crate) build_dir: Option<Utf8PathBuf>,
@@ -49,7 +50,7 @@ impl Workspace {
     ) -> Result<Self> {
         // Metadata and config
         let config = Config::load()?;
-        let current_manifest = package_root(config.cargo(), options.manifest_path.as_deref())?;
+        let current_manifest = locate_project(config.cargo(), options.manifest_path.as_deref())?;
         let metadata = Metadata::new(current_manifest.as_std_path(), config.cargo())?;
         let mut target_for_config = config.build_target_for_config(target)?;
         if target_for_config.len() != 1 {
@@ -65,6 +66,16 @@ impl Workspace {
         rustc_version.nightly =
             rustc_version.nightly || env::var_os("RUSTC_BOOTSTRAP").unwrap_or_default() == "1";
 
+        let mut current_package = None;
+        for &id in &metadata.workspace_members {
+            let manifest_path = &*metadata[id].manifest_path;
+            // no need to use same_file as cargo-metadata and cargo-locate-project
+            // as they return absolute paths resolved in the same way.
+            if manifest_path == current_manifest {
+                current_package = Some(id);
+            }
+        }
+
         if doctests && !rustc_version.nightly {
             warn!(
                 "--doctests flag requires nightly toolchain; consider using `cargo +nightly llvm-cov`"
@@ -132,6 +143,7 @@ impl Workspace {
             config,
             metadata,
             current_manifest,
+            current_package,
             target_dir,
             build_dir,
             output_dir,
@@ -182,18 +194,14 @@ impl Workspace {
     }
 }
 
-fn package_root(cargo: &OsStr, manifest_path: Option<&Utf8Path>) -> Result<Utf8PathBuf> {
-    let package_root = if let Some(manifest_path) = manifest_path {
-        manifest_path.to_owned()
-    } else {
-        locate_project(cargo)?.into()
-    };
-    Ok(package_root)
-}
-
 // https://doc.rust-lang.org/nightly/cargo/commands/cargo-locate-project.html
-fn locate_project(cargo: &OsStr) -> Result<String> {
-    cmd!(cargo, "locate-project", "--message-format", "plain").read()
+fn locate_project(cargo: &OsStr, manifest_path: Option<&Utf8Path>) -> Result<Utf8PathBuf> {
+    let mut cmd = cmd!(cargo, "locate-project");
+    if let Some(manifest_path) = manifest_path {
+        cmd.arg("--manifest-path");
+        cmd.arg(manifest_path);
+    }
+    Ok(cmd.args(["--message-format", "plain"]).read()?.into())
 }
 
 // https://doc.rust-lang.org/nightly/cargo/commands/cargo-test.html

src/cli.rs

@@ -78,11 +78,11 @@ pub(crate) struct Args {
     pub(crate) package: Vec<String>,
     /// Test all packages in the workspace
     pub(crate) workspace: bool,
-    /// Exclude packages from both the test and report
-    pub(crate) exclude: Vec<String>,
-    /// Exclude packages from the test (but not from the report)
+    /// Packages additional excluded from the test (--exclude-from-test)
+    ///
+    /// (--exclude is already contained in `cargo_args` field.)
     pub(crate) exclude_from_test: Vec<String>,
-    /// Exclude packages from the report (but not from the test)
+    /// Packages from the report (--exclude and --exclude-from-report)
     pub(crate) exclude_from_report: Vec<String>,
 
     // /// Number of parallel jobs, defaults to # of CPUs
@@ -637,7 +637,7 @@ impl Args {
         let mut archive_file = None;
         let mut nextest_archive_file = None;
 
-        let mut parser = lexopt::Parser::from_args(args.clone());
+        let mut parser = lexopt::Parser::from_args(args);
         while let Some(arg) = parser.next()? {
             macro_rules! parse_opt {
                 ($opt:tt $(,)?) => {{
@@ -1343,6 +1343,23 @@ impl Args {
             bail!("empty string is not allowed in --output-dir")
         }
 
+        for e in exclude {
+            if exclude_from_test.contains(&e) {
+                info!(
+                    "--exclude-from-test {e} is needless because it is also specified by --exclude"
+                );
+            } else {
+                // No need to push to exclude_from_test because already contained in cargo_args
+            }
+            if exclude_from_report.contains(&e) {
+                info!(
+                    "--exclude-from-report {e} is needless because it is also specified by --exclude"
+                );
+            } else {
+                exclude_from_report.push(e);
+            }
+        }
+
         // If `-vv` is passed, propagate `-v` to cargo.
         if verbose > 1 {
             cargo_args.push(format!("-{}", "v".repeat(verbose - 1)));
@@ -1411,7 +1428,6 @@ impl Args {
             all_targets,
             doc,
             workspace,
-            exclude,
             exclude_from_test,
             exclude_from_report,
             package,