From ba34d2c994fe365c9acccea4bd17139e9f2dbb7d Mon Sep 17 00:00:00 2001
From: Philippe-Cholet <44676486+Philippe-Cholet@users.noreply.github.com>
Date: Fri, 26 Apr 2024 10:18:25 +0200
Subject: [PATCH 1/3] New private method `Combinations::try_nth`

---
 src/combinations.rs | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/combinations.rs b/src/combinations.rs
index e254fee7e..6bb2f3ec6 100644
--- a/src/combinations.rs
+++ b/src/combinations.rs
@@ -143,6 +143,27 @@ impl<I: Iterator> Combinations<I> {
         // If we've made it this far, we haven't run out of combos
         false
     }
+
+    /// Returns the n-th item or the number of successful steps.
+    pub(crate) fn try_nth(&mut self, n: usize) -> Result<<Self as Iterator>::Item, usize>
+    where
+        I::Item: Clone,
+    {
+        let done = if self.first {
+            self.init()
+        } else {
+            self.increment_indices()
+        };
+        if done {
+            return Err(0);
+        }
+        for i in 0..n {
+            if self.increment_indices() {
+                return Err(i + 1);
+            }
+        }
+        Ok(self.pool.get_at(&self.indices))
+    }
 }
 
 impl<I> Iterator for Combinations<I>
@@ -166,23 +187,7 @@ where
     }
 
     fn nth(&mut self, n: usize) -> Option<Self::Item> {
-        let done = if self.first {
-            self.init()
-        } else {
-            self.increment_indices()
-        };
-
-        if done {
-            return None;
-        }
-
-        for _ in 0..n {
-            if self.increment_indices() {
-                return None;
-            }
-        }
-
-        Some(self.pool.get_at(&self.indices))
+        self.try_nth(n).ok()
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {

From 355eeefca1837eae82f465a37030d2d30e34c61b Mon Sep 17 00:00:00 2001
From: Philippe-Cholet <44676486+Philippe-Cholet@users.noreply.github.com>
Date: Fri, 26 Apr 2024 10:19:25 +0200
Subject: [PATCH 2/3] New private method `Powerset::increment_k`

---
 src/powerset.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/powerset.rs b/src/powerset.rs
index 1b2b38540..019e2711f 100644
--- a/src/powerset.rs
+++ b/src/powerset.rs
@@ -42,6 +42,18 @@ where
     }
 }
 
+impl<I: Iterator> Powerset<I> {
+    /// Returns true if `k` has been incremented, false otherwise.
+    fn increment_k(&mut self) -> bool {
+        if self.combs.k() < self.combs.n() || self.combs.k() == 0 {
+            self.combs.reset(self.combs.k() + 1);
+            true
+        } else {
+            false
+        }
+    }
+}
+
 impl<I> Iterator for Powerset<I>
 where
     I: Iterator,
@@ -52,8 +64,7 @@ where
     fn next(&mut self) -> Option<Self::Item> {
         if let Some(elt) = self.combs.next() {
             Some(elt)
-        } else if self.combs.k() < self.combs.n() || self.combs.k() == 0 {
-            self.combs.reset(self.combs.k() + 1);
+        } else if self.increment_k() {
             self.combs.next()
         } else {
             None

From aaa7f8abd8f2b6fe5661d71667a32a11d69625f8 Mon Sep 17 00:00:00 2001
From: Philippe-Cholet <44676486+Philippe-Cholet@users.noreply.github.com>
Date: Fri, 26 Apr 2024 10:19:57 +0200
Subject: [PATCH 3/3] Specialize `Powerset::nth`

---
 src/powerset.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/powerset.rs b/src/powerset.rs
index 019e2711f..734eaf614 100644
--- a/src/powerset.rs
+++ b/src/powerset.rs
@@ -71,6 +71,20 @@ where
         }
     }
 
+    fn nth(&mut self, mut n: usize) -> Option<Self::Item> {
+        loop {
+            match self.combs.try_nth(n) {
+                Ok(item) => return Some(item),
+                Err(steps) => {
+                    if !self.increment_k() {
+                        return None;
+                    }
+                    n -= steps;
+                }
+            }
+        }
+    }
+
     fn size_hint(&self) -> SizeHint {
         let k = self.combs.k();
         // Total bounds for source iterator.