avoid Fn* supertraits on Parallel* as they slightly impact type infer…

…ence
constellation-rs · Jul 14, 2020 · 001b75d · 001b75d
1 parent ec1e9b8
commit 001b75d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/amadeus-core/src/par_pipe.rs b/amadeus-core/src/par_pipe.rs
@@ -15,8 +15,8 @@ pub trait PipeTask<Source> {
 }
 
 macro_rules! pipe {
-	($pipe:ident $sink:ident $from_sink:ident $send:ident $assert_pipe:ident $assert_sink:ident) => {
-		#[cfg_attr(not(feature = "doc"), serde_closure::generalize)]
+	($pipe:ident $sink:ident $from_sink:ident $send:ident $assert_pipe:ident $assert_sink:ident $($meta:meta)*) => {
+		$(#[$meta])*
 		#[must_use]
 		pub trait $pipe<Source> {
 			type Item;
@@ -285,4 +285,4 @@ macro_rules! pipe {
 }
 
 pipe!(ParallelPipe ParallelSink FromParallelStream Send assert_parallel_pipe assert_parallel_sink);
-pipe!(DistributedPipe DistributedSink FromDistributedStream ProcessSend assert_distributed_pipe assert_distributed_sink);
+pipe!(DistributedPipe DistributedSink FromDistributedStream ProcessSend assert_distributed_pipe assert_distributed_sink cfg_attr(not(feature = "doc"), serde_closure::generalize));
diff --git a/amadeus-core/src/par_stream.rs b/amadeus-core/src/par_stream.rs
@@ -558,7 +558,6 @@ pub(crate) fn assert_distributed_stream<T, I: DistributedStream<Item = T>>(i: I)
 }
 
 #[async_trait(?Send)]
-#[cfg_attr(not(feature = "doc"), serde_closure::generalize)]
 #[must_use]
 pub trait ParallelStream {
 	type Item;

diff --git a/amadeus-core/src/pool.rs b/amadeus-core/src/pool.rs
@@ -21,7 +21,6 @@ pub trait ProcessPool: Clone + Send + Sync + RefUnwindSafe + UnwindSafe + Unpin
 		T: ProcessSend + 'static;
 }
 
-#[cfg_attr(not(feature = "doc"), serde_closure::generalize)]
 pub trait ThreadPool: Clone + Send + Sync + RefUnwindSafe + UnwindSafe + Unpin {
 	fn threads(&self) -> usize;
 	fn spawn<F, Fut, T>(&self, work: F) -> BoxFuture<'static, Result<T>>
@@ -51,7 +50,6 @@ where
 	}
 }
 
-#[cfg_attr(not(feature = "doc"), serde_closure::generalize)]
 impl<P: ?Sized> ThreadPool for &P
 where
 	P: ThreadPool,

diff --git a/src/pool.rs b/src/pool.rs
@@ -56,7 +56,6 @@ impl ProcessPoolTrait for ThreadPool {
 	}
 }
 
-#[cfg_attr(not(feature = "doc"), serde_closure::generalize)]
 impl ThreadPoolTrait for ThreadPool {
 	fn threads(&self) -> usize {
 		ThreadPool::threads(self)

diff --git a/src/pool/thread.rs b/src/pool/thread.rs
@@ -21,7 +21,6 @@ struct ThreadPoolInner {
 
 #[derive(Debug)]
 pub struct ThreadPool(Arc<ThreadPoolInner>);
-#[cfg_attr(not(feature = "doc"), serde_closure::generalize)]
 impl ThreadPool {
 	pub fn new(tasks_per_core: Option<usize>) -> io::Result<Self> {
 		let logical_cores = num_cpus::get();