Update where clause position

rust-lang/rust#89122
nickjiang2378 · Mar 11, 2022 · 021a7e3 · 021a7e3
1 parent 6d1b912
commit 021a7e3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/hydroflow/src/builder/surface/filter.rs b/hydroflow/src/builder/surface/filter.rs
@@ -48,10 +48,9 @@ where
     Prev: PushSurface,
     Func: FnMut(&Prev::ItemOut) -> bool,
 {
-    type Output<Next>
+    type Output<Next> = Prev::Output<FilterPushSurfaceReversed<Next, Func>>
     where
-        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>,
-    = Prev::Output<FilterPushSurfaceReversed<Next, Func>>;
+        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>;
 
     fn push_to<Next>(self, next: Next) -> Self::Output<Next>
     where

diff --git a/hydroflow/src/builder/surface/filter_map.rs b/hydroflow/src/builder/surface/filter_map.rs
@@ -50,10 +50,9 @@ where
     Prev: PushSurface,
     Func: FnMut(Prev::ItemOut) -> Option<Out>,
 {
-    type Output<Next>
+    type Output<Next> = Prev::Output<FilterMapPushSurfaceReversed<Next, Func, Prev::ItemOut>>
     where
-        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>,
-    = Prev::Output<FilterMapPushSurfaceReversed<Next, Func, Prev::ItemOut>>;
+        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>;
 
     fn push_to<Next>(self, next: Next) -> Self::Output<Next>
     where

diff --git a/hydroflow/src/builder/surface/flatten.rs b/hydroflow/src/builder/surface/flatten.rs
@@ -50,10 +50,9 @@ where
     Prev: PushSurface,
     Prev::ItemOut: IntoIterator,
 {
-    type Output<Next>
+    type Output<Next> = Prev::Output<FlattenPushSurfaceReversed<Next, Prev::ItemOut>>
     where
-        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>,
-    = Prev::Output<FlattenPushSurfaceReversed<Next, Prev::ItemOut>>;
+        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>;
 
     fn push_to<Next>(self, next: Next) -> Self::Output<Next>
     where

diff --git a/hydroflow/src/builder/surface/map.rs b/hydroflow/src/builder/surface/map.rs
@@ -50,10 +50,9 @@ where
     Prev: PushSurface,
     Func: FnMut(Prev::ItemOut) -> Out,
 {
-    type Output<Next>
+    type Output<Next> = Prev::Output<MapPushSurfaceReversed<Next, Func, Prev::ItemOut>>
     where
-        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>,
-    = Prev::Output<MapPushSurfaceReversed<Next, Func, Prev::ItemOut>>;
+        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>;
 
     fn push_to<Next>(self, next: Next) -> Self::Output<Next>
     where

diff --git a/hydroflow/src/builder/surface/push_pivot.rs b/hydroflow/src/builder/surface/push_pivot.rs
@@ -29,10 +29,9 @@ impl<Pull> PushSurface for PivotPushSurface<Pull>
 where
     Pull: PullSurface,
 {
-    type Output<Next>
+    type Output<Next> = PivotSurface<Pull, Next>
     where
-        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>,
-    = PivotSurface<Pull, Next>;
+        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>;
 
     fn push_to<Next>(self, next: Next) -> Self::Output<Next>
     where

diff --git a/hydroflow/src/builder/surface/push_start.rs b/hydroflow/src/builder/surface/push_start.rs
@@ -25,10 +25,9 @@ impl<Out> BaseSurface for StartPushSurface<Out> {
 }
 
 impl<Out> PushSurface for StartPushSurface<Out> {
-    type Output<Next>
+    type Output<Next> = Next
     where
-        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>,
-    = Next;
+        Next: PushSurfaceReversed<ItemIn = Self::ItemOut>;
 
     fn push_to<Next>(self, next: Next) -> Self::Output<Next>
     where