refactor

Author: Byron

git-object/src/borrowed/mod.rs

@@ -4,9 +4,8 @@ pub use commit::Commit;
 mod tag;
 pub use tag::Tag;
 
-mod tree;
-//FIXME: keep tree mode and entry in tree export it from there? Alternatively rename to TreeMode, TreeEntry?
-pub use tree::{Entry as TreeEntry, Mode as TreeMode, Tree};
+pub mod tree;
+pub use tree::Tree;
 
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]

git-object/tests/borrowed/tree.rs

@@ -1,7 +1,10 @@
 mod from_bytes {
     use crate::borrowed::fixture_bytes;
     use git_object::{
-        borrowed::{Tree, TreeEntry as Entry, TreeMode as Mode},
+        borrowed::{
+            tree::{Entry, Mode},
+            Tree,
+        },
         bstr::ByteSlice,
     };
     use hex::FromHex;

git-odb/tests/loose/mod.rs

@@ -42,12 +42,7 @@ mod db {
 
     mod locate {
         use crate::{hex_to_id, loose::db::ldb, loose::signature};
-        use git_object::{
-            borrowed,
-            borrowed::{TreeEntry, TreeMode},
-            bstr::ByteSlice,
-            Kind,
-        };
+        use git_object::{borrowed, borrowed::tree, bstr::ByteSlice, Kind};
         use git_odb::loose;
         use std::io::Read;
 
@@ -171,15 +166,15 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
 
             let expected = borrowed::Tree {
                 entries: vec![
-                    TreeEntry {
-                        mode: TreeMode::Tree,
+                    tree::Entry {
+                        mode: tree::Mode::Tree,
                         filename: b"dir".as_bstr(),
                         oid: &[
                             150, 174, 134, 139, 53, 57, 245, 81, 200, 143, 213, 240, 35, 148, 208, 34, 88, 27, 17, 176,
                         ],
                     },
-                    TreeEntry {
-                        mode: TreeMode::Blob,
+                    tree::Entry {
+                        mode: tree::Mode::Blob,
                         filename: b"file.txt".as_bstr(),
                         oid: &[
                             55, 212, 230, 197, 196, 139, 160, 210, 69, 22, 76, 78, 16, 213, 244, 17, 64, 202, 185, 128,