@@ -109,7 +109,6 @@ impl<L, R, T, F: FnMut(&L, &R) -> T> FuncLR<L, R> for F {
109
109
}
110
110
111
111
pub trait OrderingOrBool < L , R > {
112
- type Out ;
113
112
type MergeResult ;
114
113
fn left ( left : L ) -> Self :: MergeResult ;
115
114
fn right ( right : R ) -> Self :: MergeResult ;
@@ -121,7 +120,6 @@ pub trait OrderingOrBool<L, R> {
121
120
}
122
121
123
122
impl < L , R , F : FnMut ( & L , & R ) -> Ordering > OrderingOrBool < L , R > for MergeFuncLR < F , Ordering > {
124
- type Out = Ordering ;
125
123
type MergeResult = EitherOrBoth < L , R > ;
126
124
fn left ( left : L ) -> Self :: MergeResult {
127
125
EitherOrBoth :: Left ( left)
@@ -149,7 +147,6 @@ impl<L, R, F: FnMut(&L, &R) -> Ordering> OrderingOrBool<L, R> for MergeFuncLR<F,
149
147
}
150
148
151
149
impl < L , R , F : FnMut ( & L , & R ) -> bool > OrderingOrBool < L , R > for MergeFuncLR < F , bool > {
152
- type Out = bool ;
153
150
type MergeResult = Either < L , R > ;
154
151
fn left ( left : L ) -> Self :: MergeResult {
155
152
Either :: Left ( left)
@@ -171,7 +168,6 @@ impl<L, R, F: FnMut(&L, &R) -> bool> OrderingOrBool<L, R> for MergeFuncLR<F, boo
171
168
}
172
169
173
170
impl < T , F : FnMut ( & T , & T ) -> bool > OrderingOrBool < T , T > for F {
174
- type Out = bool ;
175
171
type MergeResult = T ;
176
172
fn left ( left : T ) -> Self :: MergeResult {
177
173
left
@@ -193,7 +189,6 @@ impl<T, F: FnMut(&T, &T) -> bool> OrderingOrBool<T, T> for F {
193
189
}
194
190
195
191
impl < T : PartialOrd > OrderingOrBool < T , T > for MergeLte {
196
- type Out = bool ;
197
192
type MergeResult = T ;
198
193
fn left ( left : T ) -> Self :: MergeResult {
199
194
left
@@ -235,11 +230,11 @@ where
235
230
debug_fmt_fields ! ( MergeBy , left, right) ;
236
231
}
237
232
238
- impl < I , J , F , T > Iterator for MergeBy < I , J , F >
233
+ impl < I , J , F > Iterator for MergeBy < I , J , F >
239
234
where
240
235
I : Iterator ,
241
236
J : Iterator ,
242
- F : OrderingOrBool < I :: Item , J :: Item , Out = T > ,
237
+ F : OrderingOrBool < I :: Item , J :: Item > ,
243
238
{
244
239
type Item = F :: MergeResult ;
245
240
@@ -335,10 +330,10 @@ where
335
330
}
336
331
}
337
332
338
- impl < I , J , F , T > FusedIterator for MergeBy < I , J , F >
333
+ impl < I , J , F > FusedIterator for MergeBy < I , J , F >
339
334
where
340
335
I : Iterator ,
341
336
J : Iterator ,
342
- F : OrderingOrBool < I :: Item , J :: Item , Out = T > ,
337
+ F : OrderingOrBool < I :: Item , J :: Item > ,
343
338
{
344
339
}
0 commit comments