[tree-diff] And another test that showed something was indeed wrong

Sebastian Thiel committed 5 years ago

Commit 362680f1 parent 85c57813 files · +100 −6Browse files

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

Unified · Split

2 files

             Some(Ok(rhs)) => match lhs.filename.cmp(rhs.filename) {
                 Equal => {
                     let rhs = rhs_entries.next().transpose()?.expect("the peeked item tobe present");
+                    delegate.pop_path_component();
                     handle_lhs_and_rhs_with_equal_filenames(lhs, rhs, queue, delegate)?;
                     break;
                 }
             Some(Ok(lhs)) => match lhs.filename.cmp(rhs.filename) {
                 Equal => {
                     let lhs = lhs_entries.next().expect("the peeked item to be present")?;
+                    delegate.pop_path_component();
                     handle_lhs_and_rhs_with_equal_filenames(lhs, rhs, queue, delegate)?;
                     break;
                 }

 pub struct Changes<'a>(Option<immutable::TreeIter<'a>>);
-impl<'a> From<Option<immutable::TreeIter<'a>>> for Changes<'a> {
+impl<'a, T> From<T> for Changes<'a>
-    fn from(v: Option<immutable::TreeIter<'a>>) -> Self {
+where
-        Changes(v)
+    T: Into<Option<immutable::TreeIter<'a>>>,
+{
+    fn from(v: T) -> Self {
+        Changes(v.into())
     }
 }

Keyboard shortcuts