diff --git a/lib/src/default_revset_engine.rs b/lib/src/default_revset_engine.rs index 77e07729f7..940de22533 100644 --- a/lib/src/default_revset_engine.rs +++ b/lib/src/default_revset_engine.rs @@ -404,17 +404,15 @@ where } } -struct UnionRevsetIterator< - 'index, - I1: Iterator>, - I2: Iterator>, -> { +struct UnionRevsetIterator { iter1: Peekable, iter2: Peekable, } -impl<'index, I1: Iterator>, I2: Iterator>> - Iterator for UnionRevsetIterator<'index, I1, I2> +impl<'index, I1, I2> Iterator for UnionRevsetIterator +where + I1: Iterator>, + I2: Iterator>, { type Item = IndexEntry<'index>; @@ -478,17 +476,15 @@ where } } -struct IntersectionRevsetIterator< - 'index, - I1: Iterator>, - I2: Iterator>, -> { +struct IntersectionRevsetIterator { iter1: Peekable, iter2: Peekable, } -impl<'index, I1: Iterator>, I2: Iterator>> - Iterator for IntersectionRevsetIterator<'index, I1, I2> +impl<'index, I1, I2> Iterator for IntersectionRevsetIterator +where + I1: Iterator>, + I2: Iterator>, { type Item = IndexEntry<'index>; @@ -564,17 +560,15 @@ where } } -struct DifferenceRevsetIterator< - 'index, - I1: Iterator>, - I2: Iterator>, -> { +struct DifferenceRevsetIterator { iter1: Peekable, iter2: Peekable, } -impl<'index, I1: Iterator>, I2: Iterator>> - Iterator for DifferenceRevsetIterator<'index, I1, I2> +impl<'index, I1, I2> Iterator for DifferenceRevsetIterator +where + I1: Iterator>, + I2: Iterator>, { type Item = IndexEntry<'index>;