fix: fix bounds

ScuffleCloud · Jul 13, 2024 · fc252a5 · fc252a5
1 parent 1ee5ec1
commit fc252a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/foundations/src/batcher/dataloader.rs b/foundations/src/batcher/dataloader.rs
@@ -41,11 +41,11 @@ pub trait Loader<S: BuildHasher + Default = RandomState> {
 	fn load(&self, keys: Vec<Self::Key>) -> impl std::future::Future<Output = LoaderOutput<Self, S>> + Send;
 }
 
-pub struct DataLoader<L: Loader<S> + Send + Sync, S: BuildHasher + Default + Send + Sync = RandomState> {
+pub struct DataLoader<L: Loader<S>, S: BuildHasher + Default + Send + Sync = RandomState> {
 	batcher: Batcher<Wrapper<L, S>>,
 }
 
-impl<L: Loader<S> + Send + Sync + 'static, S: BuildHasher + Default + Send + Sync + 'static> DataLoader<L, S> {
+impl<L: Loader<S> + 'static + Send + Sync, S: BuildHasher + Default + Send + Sync + 'static> DataLoader<L, S> {
 	pub fn new(loader: L) -> Self {
 		Self {
 			batcher: Batcher::new(Wrapper(loader, PhantomData)),
@@ -68,7 +68,7 @@ impl<L: Loader<S> + Send + Sync + 'static, S: BuildHasher + Default + Send + Syn
 
 struct Wrapper<L: Loader<S>, S: BuildHasher + Default = RandomState>(L, PhantomData<S>);
 
-impl<L: Loader<S> + Send + Sync, S: BuildHasher + Default + Send + Sync> BatchOperation for Wrapper<L, S> {
+impl<L: Loader<S>, S: BuildHasher + Default + Send + Sync> BatchOperation for Wrapper<L, S> {
 	type Error = L::Error;
 	type Item = L::Key;
 	type Mode = BatcherDataloader<S>;
@@ -81,7 +81,7 @@ impl<L: Loader<S> + Send + Sync, S: BuildHasher + Default + Send + Sync> BatchOp
 	fn process(
 		&self,
 		documents: <Self::Mode as super::BatchMode<Self>>::Input,
-	) -> impl std::future::Future<Output = Result<<Self::Mode as super::BatchMode<Self>>::OperationOutput, Self::Error>> + Send
+	) -> impl std::future::Future<Output = Result<<Self::Mode as super::BatchMode<Self>>::OperationOutput, Self::Error>> + Send + '_ where Self: Send + Sync
 	{
 		async move { self.0.load(documents.into_iter().collect()).await }
 	}

diff --git a/foundations/src/batcher/mod.rs b/foundations/src/batcher/mod.rs
@@ -195,7 +195,7 @@ where
 	}
 }
 
-pub trait BatchOperation: Send + Sync {
+pub trait BatchOperation {
 	type Item: Send + Sync;
 	type Response: Clone + Send + Sync;
 	type Error: Clone + std::fmt::Debug + Send + Sync;
@@ -206,7 +206,7 @@ pub trait BatchOperation: Send + Sync {
 	fn process(
 		&self,
 		documents: <Self::Mode as BatchMode<Self>>::Input,
-	) -> impl std::future::Future<Output = Result<<Self::Mode as BatchMode<Self>>::OperationOutput, Self::Error>> + Send;
+	) -> impl std::future::Future<Output = Result<<Self::Mode as BatchMode<Self>>::OperationOutput, Self::Error>> + Send + '_ where Self: Send + Sync;
 }
 
 pub struct Batcher<T: BatchOperation> {
@@ -284,7 +284,7 @@ impl<E: std::error::Error> From<E> for BatcherError<E> {
 	}
 }
 
-impl<T: BatchOperation + 'static> Batch<T> {
+impl<T: BatchOperation + 'static + Send + Sync> Batch<T> {
 	#[tracing::instrument(skip_all, fields(name = %inner.name))]
 	async fn run(self, inner: Arc<BatcherInner<T>>) {
 		self.results