Fix filtering for workspace crates comparing canonical with non-canon…

…ical paths (#94) * Fix filtering for workspace crates comparing canonical with non-canonical paths * Add test * Fix lints --------- Co-authored-by: Jake Shadle <[email protected]>
EmbarkStudios · Nov 11, 2024 · 0925e0f · 0925e0f
1 parent f042cc3
commit 0925e0f
Show file tree

Hide file tree

Showing 4 changed files with 468 additions and 18 deletions.
diff --git a/src/builder.rs b/src/builder.rs
@@ -662,11 +662,11 @@ impl Builder {
                 } else {
                     for wm in &workspace_members {
                         if let Ok(i) = packages.binary_search_by(|(id, _pkg)| id.cmp(wm)) {
-                            if self
-                                .workspace_filters
-                                .iter()
-                                .any(|wf| wf == &packages[i].1.manifest_path)
-                            {
+                            let mp = packages[i].1.manifest_path.as_std_path();
+                            let manifest_path = mp.canonicalize();
+
+                            let mp = manifest_path.as_deref().unwrap_or(mp);
+                            if self.workspace_filters.iter().any(|wf| wf == mp) {
                                 roots.insert(wm);
                             }
                         }

diff --git a/src/cm.rs b/src/cm.rs
@@ -60,19 +60,16 @@ pub struct Metadata {
 impl Metadata {
     /// Get the workspace's root package of this metadata instance.
     pub fn root_package(&self) -> Option<&Package> {
-        match &self.resolve {
-            Some(resolve) => {
-                // if dependencies are resolved, use Cargo's answer
-                let root = resolve.root.as_ref()?;
-                self.packages.iter().find(|pkg| &pkg.id == root)
-            }
-            None => {
-                // if dependencies aren't resolved, check for a root package manually
-                let root_manifest_path = self.workspace_root.join("Cargo.toml");
-                self.packages
-                    .iter()
-                    .find(|pkg| pkg.manifest_path == root_manifest_path)
-            }
+        if let Some(resolve) = &self.resolve {
+            // if dependencies are resolved, use Cargo's answer
+            let root = resolve.root.as_ref()?;
+            self.packages.iter().find(|pkg| &pkg.id == root)
+        } else {
+            // if dependencies aren't resolved, check for a root package manually
+            let root_manifest_path = self.workspace_root.join("Cargo.toml");
+            self.packages
+                .iter()
+                .find(|pkg| pkg.manifest_path == root_manifest_path)
         }
     }
 

diff --git a/tests/exclude.rs b/tests/exclude.rs
@@ -13,6 +13,16 @@ fn excludes_workspace_member() {
     insta::assert_snapshot!(grafs.dotgraph());
 }
 
+#[test]
+fn includes_by_path() {
+    let mut kb = krates::Builder::new();
+    kb.include_workspace_crates(["/home/jake/code/krates/tests/ws/c"]);
+
+    let grafs = build("all-features.json", kb).unwrap();
+
+    insta::assert_snapshot!(grafs.dotgraph());
+}
+
 #[test]
 fn excludes_dependencies() {
     let mut kb = krates::Builder::new();