Merge branch 'pierrechevalier83/main'

Author: Byron

git-object/src/commit/write.rs

@@ -23,6 +23,10 @@ impl crate::WriteTo for Commit {
         out.write_all(&self.message)
     }
 
+    fn kind(&self) -> Kind {
+        Kind::Commit
+    }
+
     fn size(&self) -> usize {
         let hash_in_hex = self.tree.kind().len_in_hex();
         b"tree".len() + 1 /*space*/ + hash_in_hex + 1 /* nl */
@@ -45,10 +49,6 @@ impl crate::WriteTo for Commit {
             + 1 /* nl */
             + self.message.len()
     }
-
-    fn kind(&self) -> Kind {
-        Kind::Commit
-    }
 }
 
 impl<'a> crate::WriteTo for CommitRef<'a> {
@@ -70,6 +70,10 @@ impl<'a> crate::WriteTo for CommitRef<'a> {
         out.write_all(self.message)
     }
 
+    fn kind(&self) -> Kind {
+        Kind::Commit
+    }
+
     fn size(&self) -> usize {
         let hash_in_hex = self.tree().kind().len_in_hex();
         b"tree".len() + 1 /* space */ + hash_in_hex + 1 /* nl */
@@ -92,8 +96,4 @@ impl<'a> crate::WriteTo for CommitRef<'a> {
             + 1 /* nl */
             + self.message.len()
     }
-
-    fn kind(&self) -> Kind {
-        Kind::Commit
-    }
 }

git-object/src/lib.rs

@@ -76,7 +76,7 @@ pub struct CommitRef<'a> {
     #[cfg_attr(feature = "serde1", serde(borrow))]
     pub tree: &'a BStr,
     /// HEX hash of each parent commit. Empty for first commit in repository.
-    pub parents: SmallVec<[&'a BStr; 2]>,
+    pub parents: SmallVec<[&'a BStr; 1]>,
     /// Who wrote this commit. Name and email might contain whitespace and are not trimmed to ensure round-tripping.
     ///
     /// Use the [`author()`][CommitRef::author()] method to received a trimmed version of it.
@@ -136,7 +136,7 @@ pub struct TagRef<'a> {
     #[cfg_attr(feature = "serde1", serde(borrow))]
     pub target: &'a BStr,
     /// The kind of object that `target` points to.
-    pub target_kind: crate::Kind,
+    pub target_kind: Kind,
     /// The name of the tag, e.g. "v1.0".
     pub name: &'a BStr,
     /// The author of the tag.
@@ -162,7 +162,7 @@ pub struct Tag {
     /// The hash this tag is pointing to.
     pub target: git_hash::ObjectId,
     /// The kind of object this tag is pointing to.
-    pub target_kind: crate::Kind,
+    pub target_kind: Kind,
     /// The name of the tag, e.g. "v1.0".
     pub name: BString,
     /// The tags author.

git-object/src/object/convert.rs

@@ -13,7 +13,7 @@ impl From<TagRef<'_>> for Tag {
             pgp_signature,
         } = other;
         Tag {
-            target: git_hash::ObjectId::from_hex(target).expect("40 bytes hex sha1"),
+            target: git_hash::ObjectId::from_hex(target).expect("prior parser validation"),
             name: name.to_owned(),
             target_kind,
             message: message.to_owned(),
@@ -35,10 +35,10 @@ impl From<CommitRef<'_>> for Commit {
             extra_headers,
         } = other;
         Commit {
-            tree: git_hash::ObjectId::from_hex(tree).expect("40 bytes hex sha1"),
+            tree: git_hash::ObjectId::from_hex(tree).expect("prior parser validation"),
             parents: parents
                 .iter()
-                .map(|parent| git_hash::ObjectId::from_hex(parent).expect("40 bytes hex sha1"))
+                .map(|parent| git_hash::ObjectId::from_hex(parent).expect("prior parser validation"))
                 .collect(),
             author: author.into(),
             committer: committer.into(),

git-object/src/tag/write.rs

@@ -31,36 +31,36 @@ impl crate::WriteTo for Tag {
 
         out.write_all(NL)?;
         if !self.message.is_empty() {
-            out.write_all(&self.message)?;
+            out.write_all(self.message.as_ref())?;
         }
-        if let Some(ref message) = self.pgp_signature {
+        if let Some(message) = &self.pgp_signature {
             out.write_all(NL)?;
-            out.write_all(message)?;
+            out.write_all(message.as_ref())?;
         }
         Ok(())
     }
 
+    fn kind(&self) -> Kind {
+        Kind::Tag
+    }
+
     fn size(&self) -> usize {
         b"object".len() + 1 /* space */ + self.target.kind().len_in_hex() + 1 /* nl */
             + b"type".len() + 1 /* space */ + self.target_kind.as_bytes().len() + 1 /* nl */
             + b"tag".len() + 1 /* space */ + self.name.len() + 1 /* nl */
             + self
-                .tagger
-                .as_ref()
-                .map(|t| b"tagger".len() + 1 /* space */ + t.size() + 1 /* nl */)
-                .unwrap_or(0)
+            .tagger
+            .as_ref()
+            .map(|t| b"tagger".len() + 1 /* space */ + t.size() + 1 /* nl */)
+            .unwrap_or(0)
             + 1 /* nl */ + self.message.len()
-            + self.pgp_signature.as_ref().map(|m| 1 /* nl */ + m.len() ).unwrap_or(0)
-    }
-
-    fn kind(&self) -> Kind {
-        Kind::Tag
+            + self.pgp_signature.as_ref().map(|m| 1 /* nl */ + m.len()).unwrap_or(0)
     }
 }
 
 impl<'a> crate::WriteTo for TagRef<'a> {
     fn write_to(&self, mut out: impl io::Write) -> io::Result<()> {
-        encode::trusted_header_id(b"object", &self.target(), &mut out)?;
+        encode::trusted_header_field(b"object", self.target, &mut out)?;
         encode::trusted_header_field(b"type", self.target_kind.as_bytes(), &mut out)?;
         encode::header_field(b"tag", validated_name(self.name)?, &mut out)?;
         if let Some(tagger) = &self.tagger {
@@ -78,6 +78,10 @@ impl<'a> crate::WriteTo for TagRef<'a> {
         Ok(())
     }
 
+    fn kind(&self) -> Kind {
+        Kind::Tag
+    }
+
     fn size(&self) -> usize {
         b"object".len() + 1 /* space */ + self.target().kind().len_in_hex() + 1 /* nl */
             + b"type".len() + 1 /* space */ + self.target_kind.as_bytes().len() + 1 /* nl */
@@ -90,10 +94,6 @@ impl<'a> crate::WriteTo for TagRef<'a> {
             + 1 /* nl */ + self.message.len()
             + self.pgp_signature.as_ref().map(|m| 1 /* nl */ + m.len()).unwrap_or(0)
     }
-
-    fn kind(&self) -> Kind {
-        Kind::Tag
-    }
 }
 
 fn validated_name(name: &BStr) -> Result<&BStr, Error> {

git-repository/src/repository/object.rs

@@ -1,6 +1,6 @@
 use std::convert::TryInto;
 
-use git_hash::{oid, ObjectId};
+use git_hash::ObjectId;
 use git_odb::{Find, FindExt, Write};
 use git_ref::{
     transaction::{LogChange, PreviousValue, RefLog},
@@ -106,13 +106,12 @@ impl crate::Repository {
     pub fn tag(
         &self,
         name: impl AsRef<str>,
-        target: impl AsRef<oid>,
+        target: impl AsRef<git_hash::oid>,
         target_kind: git_object::Kind,
         tagger: Option<git_actor::SignatureRef<'_>>,
         message: impl AsRef<str>,
         constraint: PreviousValue,
     ) -> Result<Reference<'_>, tag::Error> {
-        // NOTE: This could be more efficient if we use a TagRef instead.
         let tag = git_object::Tag {
             target: target.as_ref().into(),
             target_kind,