refactor

Author: Byron

git-object/src/borrowed/object.rs

@@ -1,13 +1,14 @@
-mod error;
-pub use error::Error;
+use bstr::BStr;
 
-use crate::BStr;
 use crate::{
     borrowed,
     borrowed::{parse, Blob, Commit, Tag, Tree},
-    Time,
+    Kind, Time,
 };
 
+mod error;
+pub use error::Error;
+
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub struct Signature<'a> {
@@ -33,6 +34,18 @@ pub enum Object<'a> {
     Blob(Blob<'a>),
 }
 
+impl<'a> Object<'a> {
+    pub fn from_bytes(kind: Kind, bytes: &'a [u8]) -> Result<Object<'a>, Error> {
+        Ok(match kind {
+            Kind::Tag => Object::Tag(Tag::from_bytes(bytes)?),
+            Kind::Tree => Object::Tree(Tree::from_bytes(bytes)?),
+            Kind::Commit => Object::Commit(Commit::from_bytes(bytes)?),
+            Kind::Blob => Object::Blob(Blob { data: bytes }),
+        })
+    }
+}
+
+/// Convenient access to contained objects
 impl<'a> Object<'a> {
     pub fn as_blob(&self) -> Option<&borrowed::Blob> {
         match self {
@@ -58,12 +71,12 @@ impl<'a> Object<'a> {
             _ => None,
         }
     }
-    pub fn kind(&self) -> crate::Kind {
+    pub fn kind(&self) -> Kind {
         match self {
-            Object::Tag(_) => crate::Kind::Tag,
-            Object::Commit(_) => crate::Kind::Commit,
-            Object::Tree(_) => crate::Kind::Tree,
-            Object::Blob(_) => crate::Kind::Blob,
+            Object::Tag(_) => Kind::Tag,
+            Object::Commit(_) => Kind::Commit,
+            Object::Tree(_) => Kind::Tree,
+            Object::Blob(_) => Kind::Blob,
         }
     }
 }

git-odb/src/loose/object/decode.rs

@@ -15,8 +15,8 @@ quick_error! {
             from()
             cause(err)
         }
-        ParseTag(err: borrowed::Error) {
-            display("Could not parse tag object")
+        Parse(err: borrowed::Error) {
+            display("Could not parse object object")
             from()
             cause(err)
         }
@@ -33,12 +33,7 @@ impl loose::Object {
     pub fn decode(&mut self) -> Result<borrowed::Object, Error> {
         self.decompress_all()?;
         let bytes = &self.decompressed_data[self.header_size..];
-        Ok(match self.kind {
-            object::Kind::Tag => borrowed::Object::Tag(borrowed::Tag::from_bytes(bytes)?),
-            object::Kind::Tree => borrowed::Object::Tree(borrowed::Tree::from_bytes(bytes)?),
-            object::Kind::Commit => borrowed::Object::Commit(borrowed::Commit::from_bytes(bytes)?),
-            object::Kind::Blob => borrowed::Object::Blob(borrowed::Blob { data: bytes }),
-        })
+        Ok(borrowed::Object::from_bytes(self.kind, bytes)?)
     }
 
     pub fn stream(&self) -> Result<stream::Reader, Error> {