refactor

Byron · Byron · commit a4d5f99c8dc9 · 2021-04-27T14:06:16.000+08:00
diff --git a/git-diff/src/visit/record.rs b/git-diff/src/visit/record.rs
@@ -2,7 +2,7 @@ use git_hash::ObjectId;
 use git_object::{bstr::BStr, tree};
 
 pub enum Change {
-    Addition { mode: tree::Mode, oid: ObjectId },
+    Addition { mode: tree::EntryMode, oid: ObjectId },
     Copy,
     Deletion,
     Modification,
diff --git a/git-diff/src/visit/recorder.rs b/git-diff/src/visit/recorder.rs
@@ -9,7 +9,7 @@ use std::{ops::Deref, path::PathBuf};
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Change {
     Addition {
-        mode: tree::Mode,
+        mode: tree::EntryMode,
         oid: ObjectId,
         path: PathBuf,
     },
diff --git a/git-diff/tests/visit/mod.rs b/git-diff/tests/visit/mod.rs
@@ -62,7 +62,7 @@ mod changes {
             assert_eq!(
                 diff_at(FIRST_COMMIT).unwrap(),
                 vec![recorder::Change::Addition {
-                    mode: git_object::tree::Mode::Tree,
+                    mode: git_object::tree::EntryMode::Tree,
                     oid: hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"),
                     path: "f".into()
                 }]
diff --git a/git-object/src/immutable/tree.rs b/git-object/src/immutable/tree.rs
@@ -28,7 +28,7 @@ pub struct Tree<'a> {
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub struct Entry<'a> {
     /// The kind of object to which `oid` is pointing.
-    pub mode: tree::Mode,
+    pub mode: tree::EntryMode,
     /// The name of the file in the parent tree.
     pub filename: &'a BStr,
     /// The id of the object representing the entry.
@@ -50,18 +50,18 @@ impl<'a> Tree<'a> {
     }
 }
 
-impl TryFrom<&[u8]> for tree::Mode {
+impl TryFrom<&[u8]> for tree::EntryMode {
     type Error = decode::Error;
 
     fn try_from(mode: &[u8]) -> Result<Self, Self::Error> {
         Ok(match mode {
-            b"40000" => tree::Mode::Tree,
-            b"100644" => tree::Mode::Blob,
-            b"100664" => tree::Mode::Blob, // rare and found in the linux kernel
-            b"100640" => tree::Mode::Blob, // rare and found in the Rust repo
-            b"100755" => tree::Mode::BlobExecutable,
-            b"120000" => tree::Mode::Link,
-            b"160000" => tree::Mode::Commit,
+            b"40000" => tree::EntryMode::Tree,
+            b"100644" => tree::EntryMode::Blob,
+            b"100664" => tree::EntryMode::Blob, // rare and found in the linux kernel
+            b"100640" => tree::EntryMode::Blob, // rare and found in the Rust repo
+            b"100755" => tree::EntryMode::BlobExecutable,
+            b"120000" => tree::EntryMode::Link,
+            b"160000" => tree::EntryMode::Commit,
             _ => return Err(decode::Error::NomDetail(mode.into(), "unknown tree mode")),
         })
     }
@@ -70,7 +70,7 @@ impl TryFrom<&[u8]> for tree::Mode {
 const NULL: &[u8] = b"\0";
 fn parse_entry(i: &[u8]) -> IResult<&[u8], Entry<'_>, decode::Error> {
     let (i, mode) = terminated(take_while_m_n(5, 6, is_digit), tag(SPACE))(i)?;
-    let mode = tree::Mode::try_from(mode).map_err(nom::Err::Error)?;
+    let mode = tree::EntryMode::try_from(mode).map_err(nom::Err::Error)?;
     let (i, filename) = terminated(take_while1(|b| b != NULL[0]), tag(NULL))(i)?;
     let (i, oid) = take(20u8)(i)?;
 
diff --git a/git-object/src/mutable/tree.rs b/git-object/src/mutable/tree.rs
@@ -1,4 +1,4 @@
-use crate::{mutable::SPACE, tree::Mode};
+use crate::{mutable::SPACE, tree::EntryMode};
 use bstr::{BString, ByteSlice};
 use quick_error::quick_error;
 use std::cmp::Ordering;
@@ -34,7 +34,7 @@ pub struct Tree {
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub struct Entry {
     /// The kind of object to which `oid` is pointing to.
-    pub mode: Mode,
+    pub mode: EntryMode,
     /// The name of the file in the parent tree.
     pub filename: BString,
     /// The id of the object representing the entry.
@@ -56,10 +56,10 @@ impl Ord for Entry {
 }
 
 /// Serialization
-impl Mode {
+impl EntryMode {
     /// Return the representation as used in the git internal format.
     pub fn as_bytes(&self) -> &'static [u8] {
-        use Mode::*;
+        use EntryMode::*;
         match self {
             Tree => b"40000",
             Blob => b"100644",
diff --git a/git-object/src/types.rs b/git-object/src/types.rs
@@ -112,7 +112,7 @@ pub mod tree {
     #[repr(u16)]
     #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
     #[allow(missing_docs)]
-    pub enum Mode {
+    pub enum EntryMode {
         Tree = 0o040000u16,
         Blob = 0o100644,
         BlobExecutable = 0o100755,
diff --git a/git-object/tests/immutable/tree.rs b/git-object/tests/immutable/tree.rs
@@ -22,27 +22,27 @@ mod from_bytes {
             Tree {
                 entries: vec![
                     Entry {
-                        mode: tree::Mode::BlobExecutable,
+                        mode: tree::EntryMode::BlobExecutable,
                         filename: b"exe".as_bstr(),
                         oid: as_id(&hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"))
                     },
                     Entry {
-                        mode: tree::Mode::Blob,
+                        mode: tree::EntryMode::Blob,
                         filename: b"file".as_bstr(),
                         oid: as_id(&hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"))
                     },
                     Entry {
-                        mode: tree::Mode::Commit,
+                        mode: tree::EntryMode::Commit,
                         filename: b"grit-submodule".as_bstr(),
                         oid: as_id(&hex_to_id("b2d1b5d684bdfda5f922b466cc13d4ce2d635cf8"))
                     },
                     Entry {
-                        mode: tree::Mode::Tree,
+                        mode: tree::EntryMode::Tree,
                         filename: b"subdir".as_bstr(),
                         oid: as_id(&hex_to_id("4d5fcadc293a348e88f777dc0920f11e7d71441c"))
                     },
                     Entry {
-                        mode: tree::Mode::Link,
+                        mode: tree::EntryMode::Link,
                         filename: b"symlink".as_bstr(),
                         oid: as_id(&hex_to_id("1a010b1c0f081b2e8901d55307a15c29ff30af0e"))
                     }
diff --git a/git-odb/tests/odb/loose/db.rs b/git-odb/tests/odb/loose/db.rs
@@ -60,7 +60,7 @@ mod locate {
             signature,
         },
     };
-    use git_object::{bstr::ByteSlice, immutable, immutable::tree, tree::Mode, Kind};
+    use git_object::{bstr::ByteSlice, immutable, immutable::tree, tree::EntryMode, Kind};
 
     fn locate<'a>(hex: &str, buf: &'a mut Vec<u8>) -> git_odb::data::Object<'a> {
         locate_oid(hex_to_id(hex), buf)
@@ -182,14 +182,14 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
         let expected = immutable::Tree {
             entries: vec![
                 tree::Entry {
-                    mode: Mode::Tree,
+                    mode: EntryMode::Tree,
                     filename: b"dir".as_bstr(),
                     oid: as_id(&[
                         150, 174, 134, 139, 53, 57, 245, 81, 200, 143, 213, 240, 35, 148, 208, 34, 88, 27, 17, 176,
                     ]),
                 },
                 tree::Entry {
-                    mode: Mode::Blob,
+                    mode: EntryMode::Blob,
                     filename: b"file.txt".as_bstr(),
                     oid: as_id(&[
                         55, 212, 230, 197, 196, 139, 160, 210, 69, 22, 76, 78, 16, 213, 244, 17, 64, 202, 185, 128,
