[pack #179] refactor

Author: Byron

git-pack/CHANGELOG.md

@@ -10,6 +10,8 @@
    - `bundle::Bundle` -> `Bundle`
    - `bundle::Error` -> `bundle::init::Error`
    - `pub tree::` -> `pub(crate) cache::delta::`
- 
+   - `data::object::Object` -> `data::Object`
+   - `data::entry::Entry` -> `data::Entry`
+
 * **new methods**
    - `Find::find_tag_iter()`

git-pack/src/data/entry/mod.rs

@@ -1,3 +1,4 @@
+use crate::data::Entry;
 use git_hash::SIZE_OF_SHA1_DIGEST as SHA1_SIZE;
 
 const _TYPE_EXT1: u8 = 0;
@@ -9,18 +10,6 @@ const _TYPE_EXT2: u8 = 5;
 const OFS_DELTA: u8 = 6;
 const REF_DELTA: u8 = 7;
 
-/// An representing an full- or delta-object within a pack
-#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-pub struct Entry {
-    /// The entry's header
-    pub header: Header,
-    /// The decompressed size of the object in bytes
-    pub decompressed_size: u64,
-    /// absolute offset to compressed object data in the pack, just behind the entry's header
-    pub data_offset: u64,
-}
-
 /// Access
 impl Entry {
     /// Compute the pack offset to the base entry of the object represented by this entry.

git-pack/src/data/mod.rs

@@ -4,18 +4,38 @@ use std::{convert::TryInto, path::Path};
 use filebuffer::FileBuffer;
 use git_hash::SIZE_OF_SHA1_DIGEST as SHA1_SIZE;
 
+/// An representing an full- or delta-object within a pack
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+pub struct Entry {
+    /// The entry's header
+    pub header: entry::Header,
+    /// The decompressed size of the object in bytes
+    pub decompressed_size: u64,
+    /// absolute offset to compressed object data in the pack, just behind the entry's header
+    pub data_offset: u64,
+}
+
+/// A borrowed object using a borrowed slice as backing buffer.
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+pub struct Object<'a> {
+    /// kind of object
+    pub kind: git_object::Kind,
+    /// decoded, decompressed data, owned by a backing store.
+    pub data: &'a [u8],
+    /// If `Some`, this object is from a pack whose pack location can be used to look up pack related information
+    pub pack_location: Option<crate::bundle::Location>,
+}
+
 mod file;
 pub use file::{decode_entry, verify, ResolvedBase};
 ///
 pub mod header;
 
 ///
 pub mod entry;
-#[doc(inline)]
-pub use entry::Entry;
 
 pub mod object;
-pub use object::Object;
 
 ///
 pub mod input;

git-pack/src/data/object.rs

@@ -1,18 +1,8 @@
 //! Contains a borrowed Object bound to a buffer holding its decompressed data.
 
+use crate::data::Object;
 use git_object::{BlobRef, CommitRef, CommitRefIter, ObjectRef, TagRef, TagRefIter, TreeRef, TreeRefIter};
 
-/// A borrowed object using a borrowed slice as backing buffer.
-#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
-pub struct Object<'a> {
-    /// kind of object
-    pub kind: git_object::Kind,
-    /// decoded, decompressed data, owned by a backing store.
-    pub data: &'a [u8],
-    /// If `Some`, this object is from a pack whose pack location can be used to look up pack related information
-    pub pack_location: Option<crate::bundle::Location>,
-}
-
 impl<'a> Object<'a> {
     /// Constructs a new data object from `kind` and `data`.
     pub fn new(kind: git_object::Kind, data: &'a [u8]) -> Object<'a> {