@@ -28,7 +28,7 @@ pub struct Tree<'a> {
28
28
#[ cfg_attr( feature = "serde1" , derive( serde:: Serialize , serde:: Deserialize ) ) ]
29
29
pub struct Entry < ' a > {
30
30
/// The kind of object to which `oid` is pointing.
31
- pub mode : tree:: Mode ,
31
+ pub mode : tree:: EntryMode ,
32
32
/// The name of the file in the parent tree.
33
33
pub filename : & ' a BStr ,
34
34
/// The id of the object representing the entry.
@@ -50,18 +50,18 @@ impl<'a> Tree<'a> {
50
50
}
51
51
}
52
52
53
- impl TryFrom < & [ u8 ] > for tree:: Mode {
53
+ impl TryFrom < & [ u8 ] > for tree:: EntryMode {
54
54
type Error = decode:: Error ;
55
55
56
56
fn try_from ( mode : & [ u8 ] ) -> Result < Self , Self :: Error > {
57
57
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 ,
65
65
_ => return Err ( decode:: Error :: NomDetail ( mode. into ( ) , "unknown tree mode" ) ) ,
66
66
} )
67
67
}
@@ -70,7 +70,7 @@ impl TryFrom<&[u8]> for tree::Mode {
70
70
const NULL : & [ u8 ] = b"\0 " ;
71
71
fn parse_entry ( i : & [ u8 ] ) -> IResult < & [ u8 ] , Entry < ' _ > , decode:: Error > {
72
72
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 ) ?;
74
74
let ( i, filename) = terminated ( take_while1 ( |b| b != NULL [ 0 ] ) , tag ( NULL ) ) ( i) ?;
75
75
let ( i, oid) = take ( 20u8 ) ( i) ?;
76
76
0 commit comments