adapt to changes in gix-submodule

Byron · Sep 2, 2023 · f8471b1 · f8471b1
1 parent 25c5bce
commit f8471b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/gix/src/submodule/errors.rs b/gix/src/submodule/errors.rs
@@ -39,7 +39,7 @@ pub mod is_active {
         #[error(transparent)]
         InitIsActivePlatform(#[from] gix_submodule::is_active_platform::Error),
         #[error(transparent)]
-        QueryIsActive(#[from] gix_submodule::is_active_platform::is_active::Error),
+        QueryIsActive(#[from] gix_config::value::Error),
         #[error(transparent)]
         InitAttributes(#[from] crate::config::attribute_stack::Error),
         #[error(transparent)]

diff --git a/gix/src/submodule/mod.rs b/gix/src/submodule/mod.rs
@@ -140,21 +140,16 @@ impl<'repo> Submodule<'repo> {
     /// Please see the [plumbing crate documentation](gix_submodule::IsActivePlatform::is_active()) for details.
     pub fn is_active(&self) -> Result<bool, is_active::Error> {
         let (mut platform, mut attributes) = self.state.active_state_mut()?;
-        let is_active = platform.is_active(
-            &self.state.modules,
-            &self.state.repo.config.resolved,
-            self.name.as_ref(),
-            {
-                |relative_path, case, is_dir, out| {
-                    attributes
-                        .set_case(case)
-                        .at_entry(relative_path, Some(is_dir), |id, buf| {
-                            self.state.repo.objects.find_blob(id, buf)
-                        })
-                        .map_or(false, |platform| platform.matching_attributes(out))
-                }
-            },
-        )?;
+        let is_active = platform.is_active(&self.state.repo.config.resolved, self.name.as_ref(), {
+            |relative_path, case, is_dir, out| {
+                attributes
+                    .set_case(case)
+                    .at_entry(relative_path, Some(is_dir), |id, buf| {
+                        self.state.repo.objects.find_blob(id, buf)
+                    })
+                    .map_or(false, |platform| platform.matching_attributes(out))
+            }
+        })?;
         Ok(is_active)
     }