From 7c9d3f7e07e5428dc234de6c523c34f567d9cf77 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 6 Apr 2025 19:09:07 +0000
Subject: [PATCH] add ReadyEq future extension

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/utils/future/bool_ext.rs     | 48 +++++++++++++--------------
 src/core/utils/future/mod.rs          |  2 ++
 src/core/utils/future/ready_eq_ext.rs | 25 ++++++++++++++
 src/core/utils/mod.rs                 |  2 +-
 4 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 src/core/utils/future/ready_eq_ext.rs

diff --git a/src/core/utils/future/bool_ext.rs b/src/core/utils/future/bool_ext.rs
index c93c7dbc..24f239ff 100644
--- a/src/core/utils/future/bool_ext.rs
+++ b/src/core/utils/future/bool_ext.rs
@@ -22,30 +22,6 @@ where
 		Self: Sized + Unpin;
 }
 
-pub async fn and<I, F>(args: I) -> impl Future<Output = bool> + Send
-where
-	I: Iterator<Item = F> + Send,
-	F: Future<Output = bool> + Send,
-{
-	type Result = crate::Result<(), ()>;
-
-	let args = args.map(|a| a.map(|a| a.then_some(()).ok_or(Result::Err(()))));
-
-	try_join_all(args).map(|result| result.is_ok())
-}
-
-pub async fn or<I, F>(args: I) -> impl Future<Output = bool> + Send
-where
-	I: Iterator<Item = F> + Send,
-	F: Future<Output = bool> + Send + Unpin,
-{
-	type Result = crate::Result<(), ()>;
-
-	let args = args.map(|a| a.map(|a| a.then_some(()).ok_or(Result::Err(()))));
-
-	select_ok(args).map(|result| result.is_ok())
-}
-
 impl<Fut> BoolExt for Fut
 where
 	Fut: Future<Output = bool> + Send,
@@ -80,3 +56,27 @@ where
 		try_select(a, b).map(|result| result.is_ok())
 	}
 }
+
+pub async fn and<I, F>(args: I) -> impl Future<Output = bool> + Send
+where
+	I: Iterator<Item = F> + Send,
+	F: Future<Output = bool> + Send,
+{
+	type Result = crate::Result<(), ()>;
+
+	let args = args.map(|a| a.map(|a| a.then_some(()).ok_or(Result::Err(()))));
+
+	try_join_all(args).map(|result| result.is_ok())
+}
+
+pub async fn or<I, F>(args: I) -> impl Future<Output = bool> + Send
+where
+	I: Iterator<Item = F> + Send,
+	F: Future<Output = bool> + Send + Unpin,
+{
+	type Result = crate::Result<(), ()>;
+
+	let args = args.map(|a| a.map(|a| a.then_some(()).ok_or(Result::Err(()))));
+
+	select_ok(args).map(|result| result.is_ok())
+}
diff --git a/src/core/utils/future/mod.rs b/src/core/utils/future/mod.rs
index 4edd0102..d896e66d 100644
--- a/src/core/utils/future/mod.rs
+++ b/src/core/utils/future/mod.rs
@@ -2,10 +2,12 @@ mod bool_ext;
 mod ext_ext;
 mod option_ext;
 mod option_stream;
+mod ready_eq_ext;
 mod try_ext_ext;
 
 pub use bool_ext::{BoolExt, and, or};
 pub use ext_ext::ExtExt;
 pub use option_ext::OptionExt;
 pub use option_stream::OptionStream;
+pub use ready_eq_ext::ReadyEqExt;
 pub use try_ext_ext::TryExtExt;
diff --git a/src/core/utils/future/ready_eq_ext.rs b/src/core/utils/future/ready_eq_ext.rs
new file mode 100644
index 00000000..1625adae
--- /dev/null
+++ b/src/core/utils/future/ready_eq_ext.rs
@@ -0,0 +1,25 @@
+//! Future extension for Partial Equality against present value
+
+use futures::{Future, FutureExt};
+
+pub trait ReadyEqExt<T>
+where
+	Self: Future<Output = T> + Send + Sized,
+	T: PartialEq + Send + Sync,
+{
+	fn eq(self, t: &T) -> impl Future<Output = bool> + Send;
+
+	fn ne(self, t: &T) -> impl Future<Output = bool> + Send;
+}
+
+impl<Fut, T> ReadyEqExt<T> for Fut
+where
+	Fut: Future<Output = T> + Send + Sized,
+	T: PartialEq + Send + Sync,
+{
+	#[inline]
+	fn eq(self, t: &T) -> impl Future<Output = bool> + Send { self.map(move |r| r.eq(t)) }
+
+	#[inline]
+	fn ne(self, t: &T) -> impl Future<Output = bool> + Send { self.map(move |r| r.ne(t)) }
+}
diff --git a/src/core/utils/mod.rs b/src/core/utils/mod.rs
index 117fb739..5e6f2868 100644
--- a/src/core/utils/mod.rs
+++ b/src/core/utils/mod.rs
@@ -28,7 +28,7 @@ pub use self::{
 	bool::BoolExt,
 	bytes::{increment, u64_from_bytes, u64_from_u8, u64_from_u8x8},
 	debug::slice_truncated as debug_slice_truncated,
-	future::TryExtExt as TryFutureExtExt,
+	future::{BoolExt as FutureBoolExt, OptionStream, TryExtExt as TryFutureExtExt},
 	hash::sha256::delimited as calculate_hash,
 	html::Escape as HtmlEscape,
 	json::{deserialize_from_str, to_canonical_object},