Use git-object in git-odb

Author: Byron

Cargo.lock

@@ -1,7 +1,7 @@
+use crate::Time;
+use bstr::BStr;
 use quick_error::quick_error;
-use crate::{Time};
 use std::str;
-use bstr::BStr;
 
 mod tag;
 mod util;

git-object/src/parsed/mod.rs

@@ -131,7 +131,12 @@ impl<'data> Tag<'data> {
                         .and_then(|(_, kind)| crate::Kind::from_bytes(kind).map_err(Into::into))?;
                     let (_, name) = split2_at_space(name, |f, _v| f == b"tag")?;
                     let (_, rest) = split2_at_space(tagger, |f, _v| f == b"tagger")?;
-                    (target.as_bstr(), kind, name.as_bstr(), parse_signature(rest)?)
+                    (
+                        target.as_bstr(),
+                        kind,
+                        name.as_bstr(),
+                        parse_signature(rest)?,
+                    )
                 }
                 _ => {
                     return Err(Error::ParseError(

git-object/src/parsed/tag.rs

@@ -1,15 +1,10 @@
 use super::fixture_bytes;
-use bstr::ByteSlice;
 use crate::{
-    Time,
-    Sign,
-        parsed::{
-            self,
-            tests::bin
-        },
-        Kind,
+    parsed::{self, tests::bin},
+    Kind, Sign, Time,
 };
-use pretty_assertions::{assert_eq};
+use bstr::ByteSlice;
+use pretty_assertions::assert_eq;
 
 #[test]
 fn tag_parse() {
@@ -47,7 +42,7 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
 =aIns
 -----END PGP SIGNATURE-----
 "
-                .as_bstr(),
+            .as_bstr(),
         ),
         signature: parsed::Signature {
             name: b"Sebastian Thiel".as_bstr(),

git-object/src/parsed/tests/tag.rs

@@ -19,7 +19,7 @@ byteorder = "1.2.3"
 itertools = "0.9.0"
 btoi = "0.4.2"
 bstr = { version = "0.2.13", default-features = false, features = ["std"] }
-nom = { version = "6.0.0-alpha1", default-features = false }
+git-object = { version = "0.1.0", path = "../git-object" }
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

git-odb/Cargo.toml

@@ -3,11 +3,7 @@ extern crate quick_error;
 #[macro_use]
 extern crate itertools;
 
-mod types;
 mod zlib;
 
 pub mod loose;
-pub mod object;
 pub mod pack;
-
-pub use types::*;

git-odb/src/lib.rs

@@ -1,4 +1,4 @@
-use crate::object;
+use git_object as object;
 
 use hex::FromHex;
 use std::path::PathBuf;

git-odb/src/loose/db.rs

@@ -1,9 +1,10 @@
 use crate::{
     loose::{Db, HEADER_READ_COMPRESSED_BYTES, HEADER_READ_UNCOMPRESSED_BYTES},
-    object::{self, parsed},
     zlib,
 };
+use git_object as object;
 use hex::ToHex;
+use object::parsed;
 use smallvec::SmallVec;
 use std::{
     fs::File, io::Cursor, io::Read, os::unix::fs::MetadataExt, path::PathBuf, str, str::FromStr,