Fixing some compile issues

vercel · Mar 6, 2024 · 814a01c · 814a01c
1 parent d576090
commit 814a01c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/crates/turborepo-filewatch/src/package_changes_watcher.rs b/crates/turborepo-filewatch/src/package_changes_watcher.rs
@@ -5,7 +5,7 @@ use notify::Event;
 use tokio::sync::{broadcast, oneshot, watch};
 use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPath};
 use turborepo_repository::{
-    change_mapper::{ChangeMapper, PackageChanges},
+    change_mapper::{ChangeMapper, DefaultPackageDetector, PackageChanges},
     package_graph::{PackageGraph, PackageGraphBuilder, PackageName},
     package_json::PackageJson,
 };
@@ -120,8 +120,10 @@ impl Subscriber {
             self.package_change_events_tx
                 .send(PackageChangeEvent::Rediscover)
                 .ok();
+            let package_change_mapper = DefaultPackageDetector::new(&repo_state.pkg_dep_graph);
             // TODO: Pass in global_deps and ignore_patterns
-            let mut change_mapper = ChangeMapper::new(&repo_state.pkg_dep_graph, vec![], vec![]);
+            let mut change_mapper =
+                ChangeMapper::new(&repo_state.pkg_dep_graph, vec![], package_change_mapper);
 
             loop {
                 match repo_state.file_events.recv().await {
@@ -156,7 +158,7 @@ impl Subscriber {
                                         change_mapper = ChangeMapper::new(
                                             &repo_state.pkg_dep_graph,
                                             vec![],
-                                            vec![],
+                                            DefaultPackageDetector::new(&repo_state.pkg_dep_graph),
                                         );
                                     }
                                     None => {
@@ -191,7 +193,7 @@ impl Subscriber {
                                         change_mapper = ChangeMapper::new(
                                             &repo_state.pkg_dep_graph,
                                             vec![],
-                                            vec![],
+                                            DefaultPackageDetector::new(&repo_state.pkg_dep_graph),
                                         );
                                     }
                                     None => {

diff --git a/crates/turborepo-lib/src/global_deps_package_detector.rs b/crates/turborepo-lib/src/global_deps_package_detector.rs
@@ -119,9 +119,9 @@ mod tests {
         // therefore must be conservative about changes
         assert_eq!(package_changes, PackageChanges::All);
 
-        let turbo_package_detector =
+        let global_deps_package_mapper =
             GlobalDepsPackageDetector::new(&pkg_graph, std::iter::empty::<&str>())?;
-        let change_mapper = ChangeMapper::new(&pkg_graph, vec![], turbo_package_detector);
+        let change_mapper = ChangeMapper::new(&pkg_graph, vec![], global_deps_package_mapper);
 
         let package_changes = change_mapper.changed_packages(
             [AnchoredSystemPathBuf::from_raw("README.md")?]

diff --git a/crates/turborepo-repository/src/change_mapper.rs b/crates/turborepo-repository/src/change_mapper.rs
@@ -118,7 +118,7 @@ impl<'a, PD: PackageChangeMapper> ChangeMapper<'a, PD> {
         // get filtered files and add the packages that contain them
         let filtered_changed_files = self.filter_ignored_files(changed_files.iter())?;
         let PackageChanges::Some(mut changed_pkgs) =
-            self.get_changed_packages(filtered_changed_files.into_iter())?
+            self.get_changed_packages(filtered_changed_files.into_iter())
         else {
             return Ok(PackageChanges::All);
         };
@@ -154,21 +154,21 @@ impl<'a, PD: PackageChangeMapper> ChangeMapper<'a, PD> {
     fn get_changed_packages<'b>(
         &self,
         files: impl Iterator<Item = &'b AnchoredSystemPathBuf>,
-    ) -> Result<PackageChanges, turborepo_scm::Error> {
+    ) -> PackageChanges {
         let mut changed_packages = HashSet::new();
         for file in files {
             match self.package_detector.detect_package(file) {
                 PackageMapping::Package(pkg) => {
                     changed_packages.insert(pkg);
                 }
                 PackageMapping::All => {
-                    return Ok(PackageChanges::All);
+                    return PackageChanges::All;
                 }
                 PackageMapping::None => {}
             }
         }
 
-        Ok(PackageChanges::Some(changed_packages))
+        PackageChanges::Some(changed_packages)
     }
 
     fn get_changed_packages_from_lockfile(