From 749f29aaaba1ca117c3cd8a5bb4ebb3a031bd84f Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 22 Dec 2024 07:03:32 +0000
Subject: [PATCH] add and/and_then to BoolExt

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/utils/bool.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/core/utils/bool.rs b/src/core/utils/bool.rs
index b4192daf..b16f63e9 100644
--- a/src/core/utils/bool.rs
+++ b/src/core/utils/bool.rs
@@ -2,6 +2,10 @@
 
 /// Boolean extensions and chain.starters
 pub trait BoolExt {
+	fn and<T>(self, t: Option<T>) -> Option<T>;
+
+	fn and_then<T, F: FnOnce() -> Option<T>>(self, f: F) -> Option<T>;
+
 	#[must_use]
 	fn clone_or<T: Clone>(self, err: T, t: &T) -> T;
 
@@ -39,6 +43,12 @@ pub trait BoolExt {
 }
 
 impl BoolExt for bool {
+	#[inline]
+	fn and<T>(self, t: Option<T>) -> Option<T> { self.then_some(t).flatten() }
+
+	#[inline]
+	fn and_then<T, F: FnOnce() -> Option<T>>(self, f: F) -> Option<T> { self.then(f).flatten() }
+
 	#[inline]
 	fn clone_or<T: Clone>(self, err: T, t: &T) -> T { self.map_or(err, || t.clone()) }