fix!: unify location of error type of Repository::diff_resource_cache().

Author: Byron

gix/src/config/cache/access.rs

@@ -127,10 +127,10 @@ impl Cache {
             };
 
             if let Some(command) = section.value(config::tree::Merge::DRIVER_COMMAND.name) {
-                driver.command = command.into_owned().into();
+                driver.command = command.into_owned();
             }
             if let Some(recursive_name) = section.value(config::tree::Merge::DRIVER_RECURSIVE.name) {
-                driver.recursive = Some(recursive_name.into_owned().into());
+                driver.recursive = Some(recursive_name.into_owned());
             }
         }
         Ok(out)

gix/src/object/tree/diff/for_each.rs

@@ -18,7 +18,7 @@ pub enum Error {
     #[error("The user-provided callback failed")]
     ForEach(#[source] Box<dyn std::error::Error + Send + Sync + 'static>),
     #[error(transparent)]
-    ResourceCache(#[from] crate::repository::diff::resource_cache::Error),
+    ResourceCache(#[from] crate::repository::diff_resource_cache::Error),
     #[error("Failure during rename tracking")]
     RenameTracking(#[from] tracker::emit::Error),
 }

gix/src/object/tree/diff/mod.rs

@@ -121,7 +121,7 @@ pub mod stats {
     #[allow(missing_docs)]
     pub enum Error {
         #[error(transparent)]
-        CreateResourceCache(#[from] crate::repository::diff::resource_cache::Error),
+        CreateResourceCache(#[from] crate::repository::diff_resource_cache::Error),
         #[error(transparent)]
         ForEachChange(#[from] crate::object::tree::diff::for_each::Error),
     }

gix/src/repository/diff.rs

@@ -1,20 +1,6 @@
+use crate::repository::diff_resource_cache;
 use crate::Repository;
 
-///
-pub mod resource_cache {
-    /// The error returned by [Repository::diff_resource_cache()](super::Repository::diff_resource_cache()).
-    #[derive(Debug, thiserror::Error)]
-    #[allow(missing_docs)]
-    pub enum Error {
-        #[error("Could not obtain resource cache for diffing")]
-        ResourceCache(#[from] crate::diff::resource_cache::Error),
-        #[error(transparent)]
-        Index(#[from] crate::repository::index_or_load_from_head::Error),
-        #[error(transparent)]
-        AttributeStack(#[from] crate::config::attribute_stack::Error),
-    }
-}
-
 /// Diff-utilities
 impl Repository {
     /// Create a resource cache for diffable objects, and configured with everything it needs to know to perform diffs
@@ -31,7 +17,7 @@ impl Repository {
         &self,
         mode: gix_diff::blob::pipeline::Mode,
         worktree_roots: gix_diff::blob::pipeline::WorktreeRoots,
-    ) -> Result<gix_diff::blob::Platform, resource_cache::Error> {
+    ) -> Result<gix_diff::blob::Platform, diff_resource_cache::Error> {
         let index = self.index_or_load_from_head()?;
         Ok(crate::diff::resource_cache(
             self,
@@ -52,7 +38,7 @@ impl Repository {
     /// Return a resource cache suitable for diffing blobs from trees directly, where no worktree checkout exists.
     ///
     /// For more control, see [`diff_resource_cache()`](Self::diff_resource_cache).
-    pub fn diff_resource_cache_for_tree_diff(&self) -> Result<gix_diff::blob::Platform, resource_cache::Error> {
+    pub fn diff_resource_cache_for_tree_diff(&self) -> Result<gix_diff::blob::Platform, diff_resource_cache::Error> {
         self.diff_resource_cache(
             gix_diff::blob::pipeline::Mode::ToGit,
             gix_diff::blob::pipeline::WorktreeRoots::default(),

gix/src/repository/merge.rs

@@ -2,6 +2,7 @@ use crate::config::cache::util::ApplyLeniencyDefault;
 use crate::config::tree;
 use crate::repository::merge_resource_cache;
 use crate::Repository;
+use std::borrow::Cow;
 
 /// Diff-utilities
 impl Repository {
@@ -45,11 +46,7 @@ impl Repository {
         let filter = gix_filter::Pipeline::new(self.command_context()?, crate::filter::Pipeline::options(self)?);
         let filter = gix_merge::blob::Pipeline::new(worktree_roots, filter, self.config.merge_pipeline_options()?);
         let options = gix_merge::blob::platform::Options {
-            default_driver: self
-                .config
-                .resolved
-                .string(&tree::Merge::DEFAULT)
-                .map(|name| name.into_owned()),
+            default_driver: self.config.resolved.string(&tree::Merge::DEFAULT).map(Cow::into_owned),
         };
         let drivers = self.config.merge_drivers()?;
         Ok(gix_merge::blob::Platform::new(filter, mode, attrs, drivers, options))

gix/src/repository/mod.rs

@@ -23,7 +23,7 @@ mod cache;
 mod config;
 ///
 #[cfg(feature = "blob-diff")]
-pub mod diff;
+mod diff;
 ///
 #[cfg(feature = "dirwalk")]
 mod dirwalk;
@@ -82,6 +82,22 @@ pub mod merge_resource_cache {
     }
 }
 
+///
+#[cfg(feature = "blob-diff")]
+pub mod diff_resource_cache {
+    /// The error returned by [Repository::diff_resource_cache()](crate::Repository::diff_resource_cache()).
+    #[derive(Debug, thiserror::Error)]
+    #[allow(missing_docs)]
+    pub enum Error {
+        #[error("Could not obtain resource cache for diffing")]
+        ResourceCache(#[from] crate::diff::resource_cache::Error),
+        #[error(transparent)]
+        Index(#[from] crate::repository::index_or_load_from_head::Error),
+        #[error(transparent)]
+        AttributeStack(#[from] crate::config::attribute_stack::Error),
+    }
+}
+
 ///
 #[cfg(feature = "tree-editor")]
 pub mod edit_tree {