[object #177] migrate immutable::tree to crate::tree

Sebastian Thiel committed 5 years ago

Commit fa5cd061 parent 07be66138 files · +139 −147Browse files

Showing the changes to git-diff (3 of 38 files). Show all

Unified · Split

3 files

git-diff/src/tree/changes.rs +8 −8
git-diff/src/tree/mod.rs +3 −3
git-diff/tests/visit/mod.rs +2 −2

@@ -54,13 +54,13 @@ impl<'a> tree::Changes<'a> { · 53 unmodified lines
54	54	/// [git_cmp_rs]: https://github.com/Byron/gitoxide/blob/a4d5f99c8dc99bf814790928a3bf9649cd99486b/git-object/src/mutable/tree.rs#L52-L55
55	55	pub fn needed_to_obtain<FindFn, R, StateMut>(
56	56	mut self,
57		− other: git_object::tree::RefIter<'_>,
	57	+ other: git_object::TreeRefIter<'_>,
58	58	mut state: StateMut,
59	59	mut find: FindFn,
60	60	delegate: &mut R,
61	61	) -> Result<(), Error>
62	62	where
63		− FindFn: for<'b> FnMut(&oid, &'b mut Vec<u8>) -> Option<git_object::tree::RefIter<'b>>,
	63	+ FindFn: for<'b> FnMut(&oid, &'b mut Vec<u8>) -> Option<git_object::TreeRefIter<'b>>,
64	64	R: tree::Visit,
65	65	StateMut: BorrowMut<tree::State>,
66	66	{
@@ -120,7 +120,7 @@ impl<'a> tree::Changes<'a> { · 53 unmodified lines
120	120	}
121	121
122	122	fn delete_entry_schedule_recursion<R: tree::Visit>(
123		− entry: immutable::tree::EntryRef<'_>,
	123	+ entry: git_object::tree::EntryRef<'_>,
124	124	queue: &mut VecDeque<TreeInfoPair>,
125	125	delegate: &mut R,
126	126	) -> Result<(), Error> {
@@ -143,7 +143,7 @@ fn delete_entry_schedule_recursion<R: tree::Visit>( · 16 unmodified lines
143	143	}
144	144
145	145	fn add_entry_schedule_recursion<R: tree::Visit>(
146		− entry: immutable::tree::EntryRef<'_>,
	146	+ entry: git_object::tree::EntryRef<'_>,
147	147	queue: &mut VecDeque<TreeInfoPair>,
148	148	delegate: &mut R,
149	149	) -> Result<(), Error> {
@@ -165,7 +165,7 @@ fn add_entry_schedule_recursion<R: tree::Visit>( · 15 unmodified lines
165	165	Ok(())
166	166	}
167	167	fn catchup_rhs_with_lhs<R: tree::Visit>(
168		− rhs_entries: &mut IteratorType<git_object::tree::RefIter<'_>>,
	168	+ rhs_entries: &mut IteratorType<git_object::TreeRefIter<'_>>,
169	169	lhs: git_object::tree::EntryRef<'_>,
170	170	rhs: git_object::tree::EntryRef<'_>,
171	171	queue: &mut VecDeque<TreeInfoPair>,
@@ -205,7 +205,7 @@ fn catchup_rhs_with_lhs<R: tree::Visit>( · 33 unmodified lines
205	205	}
206	206
207	207	fn catchup_lhs_with_rhs<R: tree::Visit>(
208		− lhs_entries: &mut IteratorType<git_object::tree::RefIter<'_>>,
	208	+ lhs_entries: &mut IteratorType<git_object::TreeRefIter<'_>>,
209	209	lhs: git_object::tree::EntryRef<'_>,
210	210	rhs: git_object::tree::EntryRef<'_>,
211	211	queue: &mut VecDeque<TreeInfoPair>,
@@ -245,8 +245,8 @@ fn catchup_lhs_with_rhs<R: tree::Visit>( · 33 unmodified lines
245	245	}
246	246
247	247	fn handle_lhs_and_rhs_with_equal_filenames<R: tree::Visit>(
248		− lhs: immutable::tree::EntryRef<'_>,
249		− rhs: immutable::tree::EntryRef<'_>,
	248	+ lhs: git_object::tree::EntryRef<'_>,
	249	+ rhs: git_object::tree::EntryRef<'_>,
250	250	queue: &mut VecDeque<TreeInfoPair>,
251	251	delegate: &mut R,
252	252	) -> Result<(), Error> {

git-diff/src/tree/mod.rs+3−3

@@ -1,7 +1,7 @@
1	1	use std::collections::VecDeque;
2	2
3	3	use git_hash::ObjectId;
4		−use git_object::tree;
	4	+use git_object::TreeRefIter;
5	5
6	6	/// The state required to visit [Changes] to be instantiated with `State::default()`.
7	7	#[derive(Default, Clone)]
@@ -22,11 +22,11 @@ impl State { · 14 unmodified lines
22	22	}
23	23
24	24	/// An iterator over changes of a tree, instantiated using `Changes::from(…)`.
25		−pub struct Changes<'a>(Option<tree::RefIter<'a>>);
	25	+pub struct Changes<'a>(Option<TreeRefIter<'a>>);
26	26
27	27	impl<'a, T> From<T> for Changes<'a>
28	28	where
29		− T: Into<Option<tree::RefIter<'a>>>,
	29	+ T: Into<Option<TreeRefIter<'a>>>,
30	30	{
31	31	fn from(v: T) -> Self {
32	32	Changes(v.into())

git-diff/tests/visit/mod.rs+2−2

@@ -2,7 +2,7 @@ mod changes { · 1 unmodified line
2	2	mod to_obtain_tree {
3	3	use git_diff::tree::{recorder, recorder::Change::*};
4	4	use git_hash::{oid, ObjectId};
5		− use git_object::{bstr::ByteSlice, tree, tree::EntryMode};
	5	+ use git_object::{bstr::ByteSlice, tree::EntryMode, TreeRefIter};
6	6	use git_odb::{linked, pack, Find};
7	7
8	8	use crate::hex_to_id;
@@ -22,7 +22,7 @@ mod changes { · 13 unmodified lines
22	22	db: &linked::Store,
23	23	commit: &oid,
24	24	buf: &'a mut Vec<u8>,
25		− ) -> crate::Result<tree::RefIter<'a>> {
	25	+ ) -> crate::Result<TreeRefIter<'a>> {
26	26	let tree_id = db
27	27	.find(commit, buf, &mut pack::cache::Never)?
28	28	.ok_or_else(\|\| format!("start commit {:?} to be present", commit))?