Skip to content

Commit a4d5f99

Browse files
committed
refactor
1 parent 11018e1 commit a4d5f99

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

git-diff/src/visit/record.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use git_hash::ObjectId;
22
use git_object::{bstr::BStr, tree};
33

44
pub enum Change {
5-
Addition { mode: tree::Mode, oid: ObjectId },
5+
Addition { mode: tree::EntryMode, oid: ObjectId },
66
Copy,
77
Deletion,
88
Modification,

git-diff/src/visit/recorder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::{ops::Deref, path::PathBuf};
99
#[derive(Clone, Debug, PartialEq, Eq)]
1010
pub enum Change {
1111
Addition {
12-
mode: tree::Mode,
12+
mode: tree::EntryMode,
1313
oid: ObjectId,
1414
path: PathBuf,
1515
},

git-diff/tests/visit/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mod changes {
6262
assert_eq!(
6363
diff_at(FIRST_COMMIT).unwrap(),
6464
vec![recorder::Change::Addition {
65-
mode: git_object::tree::Mode::Tree,
65+
mode: git_object::tree::EntryMode::Tree,
6666
oid: hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"),
6767
path: "f".into()
6868
}]

git-object/src/immutable/tree.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub struct Tree<'a> {
2828
#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
2929
pub struct Entry<'a> {
3030
/// The kind of object to which `oid` is pointing.
31-
pub mode: tree::Mode,
31+
pub mode: tree::EntryMode,
3232
/// The name of the file in the parent tree.
3333
pub filename: &'a BStr,
3434
/// The id of the object representing the entry.
@@ -50,18 +50,18 @@ impl<'a> Tree<'a> {
5050
}
5151
}
5252

53-
impl TryFrom<&[u8]> for tree::Mode {
53+
impl TryFrom<&[u8]> for tree::EntryMode {
5454
type Error = decode::Error;
5555

5656
fn try_from(mode: &[u8]) -> Result<Self, Self::Error> {
5757
Ok(match mode {
58-
b"40000" => tree::Mode::Tree,
59-
b"100644" => tree::Mode::Blob,
60-
b"100664" => tree::Mode::Blob, // rare and found in the linux kernel
61-
b"100640" => tree::Mode::Blob, // rare and found in the Rust repo
62-
b"100755" => tree::Mode::BlobExecutable,
63-
b"120000" => tree::Mode::Link,
64-
b"160000" => tree::Mode::Commit,
58+
b"40000" => tree::EntryMode::Tree,
59+
b"100644" => tree::EntryMode::Blob,
60+
b"100664" => tree::EntryMode::Blob, // rare and found in the linux kernel
61+
b"100640" => tree::EntryMode::Blob, // rare and found in the Rust repo
62+
b"100755" => tree::EntryMode::BlobExecutable,
63+
b"120000" => tree::EntryMode::Link,
64+
b"160000" => tree::EntryMode::Commit,
6565
_ => return Err(decode::Error::NomDetail(mode.into(), "unknown tree mode")),
6666
})
6767
}
@@ -70,7 +70,7 @@ impl TryFrom<&[u8]> for tree::Mode {
7070
const NULL: &[u8] = b"\0";
7171
fn parse_entry(i: &[u8]) -> IResult<&[u8], Entry<'_>, decode::Error> {
7272
let (i, mode) = terminated(take_while_m_n(5, 6, is_digit), tag(SPACE))(i)?;
73-
let mode = tree::Mode::try_from(mode).map_err(nom::Err::Error)?;
73+
let mode = tree::EntryMode::try_from(mode).map_err(nom::Err::Error)?;
7474
let (i, filename) = terminated(take_while1(|b| b != NULL[0]), tag(NULL))(i)?;
7575
let (i, oid) = take(20u8)(i)?;
7676

git-object/src/mutable/tree.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{mutable::SPACE, tree::Mode};
1+
use crate::{mutable::SPACE, tree::EntryMode};
22
use bstr::{BString, ByteSlice};
33
use quick_error::quick_error;
44
use std::cmp::Ordering;
@@ -34,7 +34,7 @@ pub struct Tree {
3434
#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
3535
pub struct Entry {
3636
/// The kind of object to which `oid` is pointing to.
37-
pub mode: Mode,
37+
pub mode: EntryMode,
3838
/// The name of the file in the parent tree.
3939
pub filename: BString,
4040
/// The id of the object representing the entry.
@@ -56,10 +56,10 @@ impl Ord for Entry {
5656
}
5757

5858
/// Serialization
59-
impl Mode {
59+
impl EntryMode {
6060
/// Return the representation as used in the git internal format.
6161
pub fn as_bytes(&self) -> &'static [u8] {
62-
use Mode::*;
62+
use EntryMode::*;
6363
match self {
6464
Tree => b"40000",
6565
Blob => b"100644",

git-object/src/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub mod tree {
112112
#[repr(u16)]
113113
#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
114114
#[allow(missing_docs)]
115-
pub enum Mode {
115+
pub enum EntryMode {
116116
Tree = 0o040000u16,
117117
Blob = 0o100644,
118118
BlobExecutable = 0o100755,

git-object/tests/immutable/tree.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ mod from_bytes {
2222
Tree {
2323
entries: vec![
2424
Entry {
25-
mode: tree::Mode::BlobExecutable,
25+
mode: tree::EntryMode::BlobExecutable,
2626
filename: b"exe".as_bstr(),
2727
oid: as_id(&hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"))
2828
},
2929
Entry {
30-
mode: tree::Mode::Blob,
30+
mode: tree::EntryMode::Blob,
3131
filename: b"file".as_bstr(),
3232
oid: as_id(&hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"))
3333
},
3434
Entry {
35-
mode: tree::Mode::Commit,
35+
mode: tree::EntryMode::Commit,
3636
filename: b"grit-submodule".as_bstr(),
3737
oid: as_id(&hex_to_id("b2d1b5d684bdfda5f922b466cc13d4ce2d635cf8"))
3838
},
3939
Entry {
40-
mode: tree::Mode::Tree,
40+
mode: tree::EntryMode::Tree,
4141
filename: b"subdir".as_bstr(),
4242
oid: as_id(&hex_to_id("4d5fcadc293a348e88f777dc0920f11e7d71441c"))
4343
},
4444
Entry {
45-
mode: tree::Mode::Link,
45+
mode: tree::EntryMode::Link,
4646
filename: b"symlink".as_bstr(),
4747
oid: as_id(&hex_to_id("1a010b1c0f081b2e8901d55307a15c29ff30af0e"))
4848
}

git-odb/tests/odb/loose/db.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mod locate {
6060
signature,
6161
},
6262
};
63-
use git_object::{bstr::ByteSlice, immutable, immutable::tree, tree::Mode, Kind};
63+
use git_object::{bstr::ByteSlice, immutable, immutable::tree, tree::EntryMode, Kind};
6464

6565
fn locate<'a>(hex: &str, buf: &'a mut Vec<u8>) -> git_odb::data::Object<'a> {
6666
locate_oid(hex_to_id(hex), buf)
@@ -182,14 +182,14 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
182182
let expected = immutable::Tree {
183183
entries: vec![
184184
tree::Entry {
185-
mode: Mode::Tree,
185+
mode: EntryMode::Tree,
186186
filename: b"dir".as_bstr(),
187187
oid: as_id(&[
188188
150, 174, 134, 139, 53, 57, 245, 81, 200, 143, 213, 240, 35, 148, 208, 34, 88, 27, 17, 176,
189189
]),
190190
},
191191
tree::Entry {
192-
mode: Mode::Blob,
192+
mode: EntryMode::Blob,
193193
filename: b"file.txt".as_bstr(),
194194
oid: as_id(&[
195195
55, 212, 230, 197, 196, 139, 160, 210, 69, 22, 76, 78, 16, 213, 244, 17, 64, 202, 185, 128,

0 commit comments

Comments
 (0)