From b18f64386518d1ecd3b09490c61e49e5f44254b4 Mon Sep 17 00:00:00 2001
From: Aaron Feickert <66188213+AaronFeickert@users.noreply.github.com>
Date: Mon, 8 Jul 2024 11:30:43 -0500
Subject: [PATCH] Implement `CtOption` merging

---
 src/lib.rs   | 12 ++++++++++++
 tests/mod.rs |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index 9fc143b..8091aa4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -815,6 +815,18 @@ impl<T> CtOption<T> {
     pub fn into_option(self) -> Option<T> {
         self.into()
     }
+
+    /// Take a `CtOption<T>` and merge it with a `CtOption<U>` to produce a
+    /// `CtOption<(T, U)>`.
+    /// 
+    /// The result contains each option's value, and is `Some` if and only if each
+    /// of the options is `Some`.
+    pub fn merge<U>(self, other: CtOption<U>) -> CtOption<(T, U)> {
+        CtOption {
+            value: (self.value, other.value),
+            is_some: self.is_some & other.is_some,
+        }
+    }
 }
 
 impl<T: ConditionallySelectable> ConditionallySelectable for CtOption<T> {
diff --git a/tests/mod.rs b/tests/mod.rs
index 888b9d0..8df800a 100644
--- a/tests/mod.rs
+++ b/tests/mod.rs
@@ -300,6 +300,12 @@ fn test_ctoption() {
     assert!(CtOption::new(1, Choice::from(1)).ct_eq(&CtOption::new(2, Choice::from(1))).unwrap_u8() == 0);
     assert!(CtOption::new(1, Choice::from(1)).ct_eq(&CtOption::new(1, Choice::from(1))).unwrap_u8() == 1);
     assert!(CtOption::new(1, Choice::from(1)).ct_eq(&CtOption::new(1, Choice::from(1))).unwrap_u8() == 1);
+
+    // Test merging
+    assert!(CtOption::new(1u8, Choice::from(0)).merge(CtOption::new(0u32, Choice::from(0))).into_option().is_none());
+    assert!(CtOption::new(1u8, Choice::from(1)).merge(CtOption::new(0u32, Choice::from(0))).into_option().is_none());
+    assert!(CtOption::new(1u8, Choice::from(0)).merge(CtOption::new(0u32, Choice::from(1))).into_option().is_none());
+    assert_eq!(CtOption::new(1u8, Choice::from(1)).merge(CtOption::new(0u32, Choice::from(1))).into_option(), Some((1u8, 0u32)));
 }
 
 #[test]