refactor

Sebastian Thiel committed 6 years ago

Commit dedd4dc1 parent de0bc3c3 files · +11 −14Browse files

Unified · Split

3 files

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

@@ -1,7 +1,10 @@
1	1	mod from_bytes {
2	2	use crate::borrowed::fixture_bytes;
3	3	use git_object::{
4		− borrowed::{Tree, TreeEntry as Entry, TreeMode as Mode},
	4	+ borrowed::{
	5	+ tree::{Entry, Mode},
	6	+ Tree,
	7	+ },
5	8	bstr::ByteSlice,
6	9	};
7	10	use hex::FromHex;

@@ -42,12 +42,7 @@ mod db { · 41 unmodified lines
42	42
43	43	mod locate {
44	44	use crate::{hex_to_id, loose::db::ldb, loose::signature};
45		− use git_object::{
46		− borrowed,
47		− borrowed::{TreeEntry, TreeMode},
48		− bstr::ByteSlice,
49		− Kind,
50		− };
	45	+ use git_object::{borrowed, borrowed::tree, bstr::ByteSlice, Kind};
51	46	use git_odb::loose;
52	47	use std::io::Read;
53	48
@@ -171,15 +166,15 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB · 117 unmodified lines
171	166
172	167	let expected = borrowed::Tree {
173	168	entries: vec![
174		− TreeEntry {
175		− mode: TreeMode::Tree,
	169	+ tree::Entry {
	170	+ mode: tree::Mode::Tree,
176	171	filename: b"dir".as_bstr(),
177	172	oid: &[
178	173	150, 174, 134, 139, 53, 57, 245, 81, 200, 143, 213, 240, 35, 148, 208, 34, 88, 27, 17, 176,
179	174	],
180	175	},
181		− TreeEntry {
182		− mode: TreeMode::Blob,
	176	+ tree::Entry {
	177	+ mode: tree::Mode::Blob,
183	178	filename: b"file.txt".as_bstr(),
184	179	oid: &[
185	180	55, 212, 230, 197, 196, 139, 160, 210, 69, 22, 76, 78, 16, 213, 244, 17, 64, 202, 185, 128,