Additional FutureBoolExt; attempt to reduce type-length expansion.

Signed-off-by: Jason Volk <jason@zemos.net>

src/core/utils/future/bool_ext.rs

@@ -6,57 +6,89 @@ use futures::{
 	Future, FutureExt,
 	future::{
 		Either::{Left, Right},
-		select_ok, try_join, try_join_all,
+		select_ok, try_join, try_join_all, try_join3, try_join4,
 	},
 };
 
+use crate::utils::BoolExt as _;
+
 pub trait BoolExt
 where
 	Self: Future<Output = bool> + Send,
 {
-	fn and<B>(self, b: B) -> impl Future<Output = bool> + Send
+	type Result;
-	where
-		B: Future<Output = bool> + Send,
-		Self: Sized;
 
 	fn or<B>(self, b: B) -> impl Future<Output = bool> + Send
 	where
 		B: Future<Output = bool> + Send + Unpin,
 		Self: Sized + Unpin;
+
+	fn and<B>(self, b: B) -> impl Future<Output = bool> + Send
+	where
+		B: Future<Output = bool> + Send,
+		Self: Sized;
+
+	fn and2<B, C>(self, b: B, c: C) -> impl Future<Output = bool> + Send
+	where
+		B: Future<Output = bool> + Send,
+		C: Future<Output = bool> + Send,
+		Self: Sized;
+
+	fn and3<B, C, D>(self, b: B, c: C, d: D) -> impl Future<Output = bool> + Send
+	where
+		B: Future<Output = bool> + Send,
+		C: Future<Output = bool> + Send,
+		D: Future<Output = bool> + Send,
+		Self: Sized;
 }
 
 impl<Fut> BoolExt for Fut
 where
 	Fut: Future<Output = bool> + Send,
 {
-	#[inline]
+	type Result = crate::Result<(), ()>;
-	fn and<B>(self, b: B) -> impl Future<Output = bool> + Send
-	where
-		B: Future<Output = bool> + Send,
-		Self: Sized,
-	{
-		type Result = crate::Result<(), ()>;
 
-		let a = self.map(|a| a.then_some(()).ok_or(Result::Err(())));
-
-		let b = b.map(|b| b.then_some(()).ok_or(Result::Err(())));
-
-		try_join(a, b).map(|result| result.is_ok())
-	}
-
-	#[inline]
 	fn or<B>(self, b: B) -> impl Future<Output = bool> + Send
 	where
 		B: Future<Output = bool> + Send + Unpin,
 		Self: Sized + Unpin,
 	{
-		type Result = crate::Result<(), ()>;
+		let test = |test: bool| test.ok_or(Self::Result::Err(()));
 
-		let a = self.map(|a| a.then_some(()).ok_or(Result::Err(())));
+		select_ok([Left(self.map(test)), Right(b.map(test))]).map(|res| res.is_ok())
+	}
 
-		let b = b.map(|b| b.then_some(()).ok_or(Result::Err(())));
+	fn and<B>(self, b: B) -> impl Future<Output = bool> + Send
+	where
+		B: Future<Output = bool> + Send,
+		Self: Sized,
+	{
+		let test = |test: bool| test.ok_or(Self::Result::Err(()));
 
-		select_ok([Left(a), Right(b)]).map(|result| result.is_ok())
+		try_join(self.map(test), b.map(test)).map(|res| res.is_ok())
+	}
+
+	fn and2<B, C>(self, b: B, c: C) -> impl Future<Output = bool> + Send
+	where
+		B: Future<Output = bool> + Send,
+		C: Future<Output = bool> + Send,
+		Self: Sized,
+	{
+		let test = |test: bool| test.ok_or(Self::Result::Err(()));
+
+		try_join3(self.map(test), b.map(test), c.map(test)).map(|res| res.is_ok())
+	}
+
+	fn and3<B, C, D>(self, b: B, c: C, d: D) -> impl Future<Output = bool> + Send
+	where
+		B: Future<Output = bool> + Send,
+		C: Future<Output = bool> + Send,
+		D: Future<Output = bool> + Send,
+		Self: Sized,
+	{
+		let test = |test: bool| test.ok_or(Self::Result::Err(()));
+
+		try_join4(self.map(test), b.map(test), c.map(test), d.map(test)).map(|res| res.is_ok())
 	}
 }
 
@@ -67,9 +99,9 @@ where
 {
 	type Result = crate::Result<(), ()>;
 
-	let args = args.map(|a| a.map(|a| a.then_some(()).ok_or(Result::Err(()))));
+	let args = args.map(|a| a.map(|a| a.ok_or(Result::Err(()))));
 
-	try_join_all(args).map(|result| result.is_ok())
+	try_join_all(args).map(|res| res.is_ok())
 }
 
 pub fn or<I, F>(args: I) -> impl Future<Output = bool> + Send
@@ -79,7 +111,7 @@ where
 {
 	type Result = crate::Result<(), ()>;
 
-	let args = args.map(|a| a.map(|a| a.then_some(()).ok_or(Result::Err(()))));
+	let args = args.map(|a| a.map(|a| a.ok_or(Result::Err(()))));
 
-	select_ok(args).map(|result| result.is_ok())
+	select_ok(args).map(|res| res.is_ok())
 }