fix merge main

kariy · kariy · commit 72c21eb27977 · 2025-11-24T17:20:26.000-05:00
diff --git a/crates/sync/pipeline/src/lib.rs b/crates/sync/pipeline/src/lib.rs
@@ -445,8 +445,11 @@ where
     }
 }
 
-impl<P: ProviderFactory + 'static,
-    <P as ProviderFactory>::ProviderMut: StageCheckpointProvider> IntoFuture for Pipeline<P> {
+impl<P> IntoFuture for Pipeline<P>
+where
+    P: ProviderFactory + 'static,
+    <P as ProviderFactory>::ProviderMut: StageCheckpointProvider,
+{
     type Output = PipelineResult<()>;
     type IntoFuture = PipelineFut;
 

Original file line number	Diff line number	Diff line change
`@@ -445,8 +445,11 @@ where`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`
`448`		`-impl<P: ProviderFactory + 'static,`
`449`		`- <P as ProviderFactory>::ProviderMut: StageCheckpointProvider> IntoFuture for Pipeline<P> {`
	`448`	`+impl<P> IntoFuture for Pipeline<P>`
	`449`	`+where`
	`450`	`+ P: ProviderFactory + 'static,`
	`451`	`+ <P as ProviderFactory>::ProviderMut: StageCheckpointProvider,`
	`452`	`+{`
`450`	`453`	`type Output = PipelineResult<()>;`
`451`	`454`	`type IntoFuture = PipelineFut;`
`452`	`455`