refactor

Sebastian Thiel committed 5 years ago

Commit fdc8c791 parent 29b527a3 files · +15 −21Browse files

Showing the changes to git-diff/src (2 of 3 files). Show all

Unified · Split

2 files

-use crate::visit;
+use crate::{
-use crate::visit::changes::Error::Cancelled;
+    visit,
-use crate::visit::record::{Action, Change, PathComponent, PathComponentUpdateMode};
+    visit::{
+        changes::Error::Cancelled,
+        record::{Action, Change, PathComponent, PathComponentUpdateMode},
+    },
+};
 use git_hash::{oid, ObjectId};
 use git_object::{immutable, tree};
 use quick_error::quick_error;
     }
 }
-impl<'a, Iter> visit::Changes<'a, Iter>
+impl<'a> visit::Changes<'a> {
-where
-    Iter: Iterator<Item = super::TreeEntryResult<'a>>,
-{
     /// Returns the changes that need to be applied to `self` to get `other`.
     ///
     /// # Notes
     /// [git_cmp_rs]: https://github.com/Byron/gitoxide/blob/a4d5f99c8dc99bf814790928a3bf9649cd99486b/git-object/src/mutable/tree.rs#L52-L55
     ///
     pub fn needed_to_obtain<LocateFn>(
-        self,
+        mut self,
-        other: Iter,
+        other: immutable::TreeIter<'a>,
         _state: &mut visit::State,
         _locate: LocateFn,
         delegate: &mut impl visit::Record,
     where
         LocateFn: for<'b> FnMut(&oid, &'b mut Vec<u8>) -> Option<immutable::Object<'b>>,
     {
-        let mut lhs_entries = self.0;
+        let mut lhs_entries = self.0.take().unwrap_or_default();
         let mut rhs_entries = other;
         let mut path_id = 0;

     buf2: Vec<u8>,
 }
-pub(crate) type TreeEntryResult<'a> = Result<immutable::tree::Entry<'a>, immutable::object::decode::Error>;
+pub struct Changes<'a>(Option<immutable::TreeIter<'a>>);
-pub struct Changes<'a, Iter>(Iter)
+impl<'a> From<Option<immutable::TreeIter<'a>>> for Changes<'a> {
-where
+    fn from(v: Option<immutable::TreeIter<'a>>) -> Self {
-    Iter: Iterator<Item = TreeEntryResult<'a>>;
-impl<'a, Iter> From<Iter> for Changes<'a, Iter>
-where
-    Iter: Iterator<Item = TreeEntryResult<'a>>,
-{
-    fn from(v: Iter) -> Self {
         Changes(v)
     }
 }