change!: Remove Find trait (as it's now living in gix-odb)

This makes it easier to access objects via trait from other crates
without having to pull in all of `gix-odb`.

Author: Byron

gix-odb/src/cache.rs

@@ -150,24 +150,29 @@ mod impls {
         }
     }
 
-    impl<S> crate::Find for Cache<S>
+    impl<S> gix_object::Find for Cache<S>
     where
         S: gix_pack::Find,
     {
-        fn contains(&self, id: &oid) -> bool {
-            self.inner.contains(id)
+        fn try_find<'a>(&self, id: &oid, buffer: &'a mut Vec<u8>) -> Result<Option<Data<'a>>, gix_object::find::Error> {
+            gix_pack::Find::try_find(self, id, buffer).map(|t| t.map(|t| t.0))
         }
+    }
 
-        fn try_find<'a>(&self, id: &oid, buffer: &'a mut Vec<u8>) -> Result<Option<Data<'a>>, crate::find::Error> {
-            gix_pack::Find::try_find(self, id, buffer).map(|t| t.map(|t| t.0))
+    impl<S> gix_object::Exists for Cache<S>
+    where
+        S: gix_pack::Find,
+    {
+        fn exists(&self, id: &oid) -> bool {
+            self.inner.contains(id)
         }
     }
 
     impl<S> crate::Header for Cache<S>
     where
         S: crate::Header,
     {
-        fn try_header(&self, id: &oid) -> Result<Option<Header>, crate::find::Error> {
+        fn try_header(&self, id: &oid) -> Result<Option<Header>, gix_object::find::Error> {
             self.inner.try_header(id)
         }
     }
@@ -184,7 +189,7 @@ mod impls {
             &self,
             id: &oid,
             buffer: &'a mut Vec<u8>,
-        ) -> Result<Option<(Data<'a>, Option<Location>)>, crate::find::Error> {
+        ) -> Result<Option<(Data<'a>, Option<Location>)>, gix_object::find::Error> {
             match self.pack_cache.as_ref().map(RefCell::borrow_mut) {
                 Some(mut pack_cache) => self.try_find_cached(id, buffer, pack_cache.deref_mut()),
                 None => self.try_find_cached(id, buffer, &mut gix_pack::cache::Never),
@@ -196,7 +201,7 @@ mod impls {
             id: &oid,
             buffer: &'a mut Vec<u8>,
             pack_cache: &mut dyn gix_pack::cache::DecodeEntry,
-        ) -> Result<Option<(Data<'a>, Option<gix_pack::data::entry::Location>)>, crate::find::Error> {
+        ) -> Result<Option<(Data<'a>, Option<gix_pack::data::entry::Location>)>, gix_object::find::Error> {
             if let Some(mut obj_cache) = self.object_cache.as_ref().map(RefCell::borrow_mut) {
                 if let Some(kind) = obj_cache.get(&id.as_ref().to_owned(), buffer) {
                     return Ok(Some((Data::new(kind, buffer), None)));

gix-odb/src/find.rs

@@ -1,56 +1,3 @@
-/// The error type returned by the [`Find`](crate::Find) and [`Header`](crate::Header) traits.
-pub type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
-///
-pub mod existing {
-    use gix_hash::ObjectId;
-
-    /// The error returned by the [`find(…)`][crate::FindExt::find()] trait methods.
-    #[derive(Debug, thiserror::Error)]
-    #[allow(missing_docs)]
-    pub enum Error {
-        #[error(transparent)]
-        Find(crate::find::Error),
-        #[error("An object with id {} could not be found", .oid)]
-        NotFound { oid: ObjectId },
-    }
-}
-
-///
-pub mod existing_object {
-    use gix_hash::ObjectId;
-
-    /// The error returned by the various [`find_*()`][crate::FindExt::find_commit()] trait methods.
-    #[derive(Debug, thiserror::Error)]
-    #[allow(missing_docs)]
-    pub enum Error {
-        #[error(transparent)]
-        Find(crate::find::Error),
-        #[error(transparent)]
-        Decode(gix_object::decode::Error),
-        #[error("An object with id {oid} could not be found")]
-        NotFound { oid: ObjectId },
-        #[error("Expected object of kind {expected}")]
-        ObjectKind { expected: gix_object::Kind },
-    }
-}
-
-///
-pub mod existing_iter {
-    use gix_hash::ObjectId;
-
-    /// The error returned by the various [`find_*_iter()`][crate::FindExt::find_commit_iter()] trait methods.
-    #[derive(Debug, thiserror::Error)]
-    #[allow(missing_docs)]
-    pub enum Error {
-        #[error(transparent)]
-        Find(crate::find::Error),
-        #[error("An object with id {oid} could not be found")]
-        NotFound { oid: ObjectId },
-        #[error("Expected object of kind {expected}")]
-        ObjectKind { expected: gix_object::Kind },
-    }
-}
-
 /// An object header informing about object properties, without it being fully decoded in the process.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub enum Header {

gix-odb/src/lib.rs

@@ -74,7 +74,7 @@ pub mod find;
 /// An object database equivalent to `/dev/null`, dropping all objects stored into it.
 mod traits;
 
-pub use traits::{Find, FindExt, Header, HeaderExt, Write};
+pub use traits::{Header, HeaderExt, Write};
 
 ///
 pub mod write {

gix-odb/src/store_impls/dynamic/find.rs

@@ -77,7 +77,8 @@ pub(crate) mod error {
 pub use error::Error;
 use gix_features::zlib;
 
-use crate::{store::types::PackId, Find};
+use crate::store::types::PackId;
+use gix_object::{Exists, Find};
 
 impl<S> super::Handle<S>
 where
@@ -503,15 +504,21 @@ where
     S: Deref<Target = super::Store> + Clone,
     Self: gix_pack::Find,
 {
-    fn contains(&self, id: &gix_hash::oid) -> bool {
-        gix_pack::Find::contains(self, id)
-    }
-
     fn try_find<'a>(
         &self,
         id: &gix_hash::oid,
         buffer: &'a mut Vec<u8>,
-    ) -> Result<Option<gix_object::Data<'a>>, crate::find::Error> {
+    ) -> Result<Option<gix_object::Data<'a>>, gix_object::find::Error> {
         gix_pack::Find::try_find(self, id, buffer).map(|t| t.map(|t| t.0))
     }
 }
+
+impl<S> Exists for super::Handle<S>
+where
+    S: Deref<Target = super::Store> + Clone,
+    Self: gix_pack::Find,
+{
+    fn exists(&self, id: &gix_hash::oid) -> bool {
+        gix_pack::Find::contains(self, id)
+    }
+}

gix-odb/src/store_impls/dynamic/header.rs

@@ -182,7 +182,7 @@ impl<S> crate::Header for super::Handle<S>
 where
     S: Deref<Target = super::Store> + Clone,
 {
-    fn try_header(&self, id: &oid) -> Result<Option<Header>, crate::find::Error> {
+    fn try_header(&self, id: &oid) -> Result<Option<Header>, gix_object::find::Error> {
         let mut snapshot = self.snapshot.borrow_mut();
         let mut inflate = self.inflate.borrow_mut();
         self.try_header_inner(id, &mut inflate, &mut snapshot, None)

gix-odb/src/store_impls/dynamic/prefix.rs

@@ -1,9 +1,7 @@
 use std::{collections::HashSet, ops::Deref};
 
-use crate::{
-    store::{load_index, Handle},
-    Find,
-};
+use crate::store::{load_index, Handle};
+use gix_object::Exists;
 
 ///
 pub mod lookup {
@@ -107,7 +105,7 @@ where
     ) -> Result<Option<gix_hash::Prefix>, disambiguate::Error> {
         let max_hex_len = candidate.id().kind().len_in_hex();
         if candidate.hex_len() == max_hex_len {
-            return Ok(self.contains(candidate.id()).then(|| candidate.to_prefix()));
+            return Ok(self.exists(candidate.id()).then(|| candidate.to_prefix()));
         }
 
         while candidate.hex_len() != max_hex_len {