lael-labs/gitoxide

git-odb/src/borrowed.rs+16−9

 //! Contains a borrowed Object bound to a buffer holding its decompressed data.
-use git_object::borrowed;
 /// A borrowed object using a borrowed slice as backing buffer.
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
 }
 impl<'a> Object<'a> {
-    /// Decodes the data in the backing slice into a [`borrowed::Object`], allowing to access all of its data
+    /// Decodes the data in the backing slice into a [`crate::borrowed::Object`], allowing to access all of its data
     /// conveniently. The cost of parsing an object is negligible.
     ///
-    /// **Note** that [owned, decoded objects][git_object::owned::Object] can be created from a [`borrowed::Object`]
+    /// **Note** that [owned, decoded objects][git_object::owned::Object] can be created from a [`crate::borrowed::Object`]
-    /// using [`borrowed::Object::into_owned()`].
+    /// using [`crate::borrowed::Object::into_owned()`].
-    pub fn decode(&self) -> Result<borrowed::Object<'_>, borrowed::Error> {
+    pub fn decode(&self) -> Result<git_object::borrowed::Object<'_>, git_object::borrowed::Error> {
         Ok(match self.kind {
-            git_object::Kind::Tree => borrowed::Object::Tree(borrowed::Tree::from_bytes(self.data)?),
+            git_object::Kind::Tree => {
-            git_object::Kind::Blob => borrowed::Object::Blob(borrowed::Blob { data: self.data }),
+                git_object::borrowed::Object::Tree(git_object::borrowed::Tree::from_bytes(self.data)?)
-            git_object::Kind::Commit => borrowed::Object::Commit(borrowed::Commit::from_bytes(self.data)?),
+            }
-            git_object::Kind::Tag => borrowed::Object::Tag(borrowed::Tag::from_bytes(self.data)?),
+            git_object::Kind::Blob => {
+                git_object::borrowed::Object::Blob(git_object::borrowed::Blob { data: self.data })
+            }
+            git_object::Kind::Commit => {
+                git_object::borrowed::Object::Commit(git_object::borrowed::Commit::from_bytes(self.data)?)
+            }
+            git_object::Kind::Tag => {
+                git_object::borrowed::Object::Tag(git_object::borrowed::Tag::from_bytes(self.data)?)
+            }
         })
     }
 }

git-odb/src/linked/locate.rs+2−2

@@ -1,4 +1,4 @@
1	use crate::{borrowed, compound, linked, pack};	1	use crate::{compound, linked, pack};
2		2
3	impl linked::Db {	3	impl linked::Db {
4	/// Find an object as identified by [`ObjectId`][git_hash::ObjectId] and store its data in full in the provided `buffer`.	4	/// Find an object as identified by [`ObjectId`][git_hash::ObjectId] and store its data in full in the provided `buffer`.
@@ -9,7 +9,7 @@ impl linked::Db { · 4 unmodified lines
9	id: impl AsRef<git_hash::oid>,	9	id: impl AsRef<git_hash::oid>,
10	buffer: &'a mut Vec<u8>,	10	buffer: &'a mut Vec<u8>,
11	pack_cache: &mut impl pack::cache::DecodeEntry,	11	pack_cache: &mut impl pack::cache::DecodeEntry,
12	) -> Result<Option<borrowed::Object<'a>>, compound::locate::Error> {	12	) -> Result<Option<crate::borrowed::Object<'a>>, compound::locate::Error> {
13	use compound::locate::PackInfo;	13	use compound::locate::PackInfo;
14	let id = id.as_ref();	14	let id = id.as_ref();
15	for db in self.dbs.iter() {	15	for db in self.dbs.iter() {

git-odb/src/loose/db/locate.rs+4−5

 use crate::{
-    borrowed,
     loose::{db::sha1_path, object::header, Db, HEADER_READ_UNCOMPRESSED_BYTES},
     zlib,
 };
         &self,
         id: impl AsRef<git_hash::oid>,
         out: &'a mut Vec<u8>,
-    ) -> Result<Option<borrowed::Object<'a>>, Error> {
+    ) -> Result<Option<crate::borrowed::Object<'a>>, Error> {
         match self.locate_inner(id.as_ref(), out) {
             Ok(obj) => Ok(Some(obj)),
             Err(err) => match err {
         }
     }
-    fn locate_inner<'a>(&self, id: &git_hash::oid, buf: &'a mut Vec<u8>) -> Result<borrowed::Object<'a>, Error> {
+    fn locate_inner<'a>(&self, id: &git_hash::oid, buf: &'a mut Vec<u8>) -> Result<crate::borrowed::Object<'a>, Error> {
         let path = sha1_path(id, self.path.clone());
         let mut inflate = zlib::Inflate::default();
             buf.copy_within(decompressed_body_bytes_sans_header, 0);
             buf.resize(size, 0);
             // TODO: assure both branches run via tests
-            Ok(borrowed::Object { kind, data: buf })
+            Ok(crate::borrowed::Object { kind, data: buf })
         } else {
             buf.resize(bytes_read + size + header_size, 0);
             {
             };
             buf.copy_within(decompressed_start + header_size.., 0);
             buf.resize(size, 0);
-            Ok(borrowed::Object { kind, data: buf })
+            Ok(crate::borrowed::Object { kind, data: buf })
         }
     }
 }

git-odb/src/pack/index/verify.rs+6−4

             match object_kind {
                 Tree | Commit | Tag => {
                     let borrowed_object =
-                        borrowed::Object::from_bytes(object_kind, buf).map_err(|err| Error::ObjectDecode {
+                        git_object::borrowed::Object::from_bytes(object_kind, buf).map_err(|err| {
-                            source: err,
+                            Error::ObjectDecode {
-                            kind: object_kind,
+                                source: err,
-                            id: index_entry.oid,
+                                kind: object_kind,
+                                id: index_entry.oid,
+                            }
                         })?;
                     if let Mode::Sha1Crc32DecodeEncode = mode {
                         let object = owned::Object::from(borrowed_object);