Skip to content

Commit 6ffdac1

Browse files
Philippe-Choletjswrenn
authored andcommitted
Remove OrderingOrBool::Out
Apparently not needed anymore.
1 parent 506264e commit 6ffdac1

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/merge_join.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ impl<L, R, T, F: FnMut(&L, &R) -> T> FuncLR<L, R> for F {
109109
}
110110

111111
pub trait OrderingOrBool<L, R> {
112-
type Out;
113112
type MergeResult;
114113
fn left(left: L) -> Self::MergeResult;
115114
fn right(right: R) -> Self::MergeResult;
@@ -121,7 +120,6 @@ pub trait OrderingOrBool<L, R> {
121120
}
122121

123122
impl<L, R, F: FnMut(&L, &R) -> Ordering> OrderingOrBool<L, R> for MergeFuncLR<F, Ordering> {
124-
type Out = Ordering;
125123
type MergeResult = EitherOrBoth<L, R>;
126124
fn left(left: L) -> Self::MergeResult {
127125
EitherOrBoth::Left(left)
@@ -149,7 +147,6 @@ impl<L, R, F: FnMut(&L, &R) -> Ordering> OrderingOrBool<L, R> for MergeFuncLR<F,
149147
}
150148

151149
impl<L, R, F: FnMut(&L, &R) -> bool> OrderingOrBool<L, R> for MergeFuncLR<F, bool> {
152-
type Out = bool;
153150
type MergeResult = Either<L, R>;
154151
fn left(left: L) -> Self::MergeResult {
155152
Either::Left(left)
@@ -171,7 +168,6 @@ impl<L, R, F: FnMut(&L, &R) -> bool> OrderingOrBool<L, R> for MergeFuncLR<F, boo
171168
}
172169

173170
impl<T, F: FnMut(&T, &T) -> bool> OrderingOrBool<T, T> for F {
174-
type Out = bool;
175171
type MergeResult = T;
176172
fn left(left: T) -> Self::MergeResult {
177173
left
@@ -193,7 +189,6 @@ impl<T, F: FnMut(&T, &T) -> bool> OrderingOrBool<T, T> for F {
193189
}
194190

195191
impl<T: PartialOrd> OrderingOrBool<T, T> for MergeLte {
196-
type Out = bool;
197192
type MergeResult = T;
198193
fn left(left: T) -> Self::MergeResult {
199194
left
@@ -235,11 +230,11 @@ where
235230
debug_fmt_fields!(MergeBy, left, right);
236231
}
237232

238-
impl<I, J, F, T> Iterator for MergeBy<I, J, F>
233+
impl<I, J, F> Iterator for MergeBy<I, J, F>
239234
where
240235
I: Iterator,
241236
J: Iterator,
242-
F: OrderingOrBool<I::Item, J::Item, Out = T>,
237+
F: OrderingOrBool<I::Item, J::Item>,
243238
{
244239
type Item = F::MergeResult;
245240

@@ -335,10 +330,10 @@ where
335330
}
336331
}
337332

338-
impl<I, J, F, T> FusedIterator for MergeBy<I, J, F>
333+
impl<I, J, F> FusedIterator for MergeBy<I, J, F>
339334
where
340335
I: Iterator,
341336
J: Iterator,
342-
F: OrderingOrBool<I::Item, J::Item, Out = T>,
337+
F: OrderingOrBool<I::Item, J::Item>,
343338
{
344339
}

0 commit comments

Comments
 (0)