From aa310a561f9b6f430db74cf1dda30192501869e3 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 24 Feb 2021 14:22:29 -0500
Subject: exhaustive: Add a wrapper type for IntoIterator

---
 src/exhaustive.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/exhaustive.rs b/src/exhaustive.rs
index 37af4c6..320994e 100644
--- a/src/exhaustive.rs
+++ b/src/exhaustive.rs
@@ -43,20 +43,24 @@ impl<T> FromIterator<T> for ExhaustiveSearch<T> {
     }
 }
 
-impl<T> IntoIterator for ExhaustiveSearch<T> {
+/// An iterator that moves values out of an exhaustive index.
+#[derive(Debug)]
+pub struct IntoIter<T>(std::vec::IntoIter<T>);
+
+impl<T> Iterator for IntoIter<T> {
     type Item = T;
-    type IntoIter = std::vec::IntoIter<T>;
 
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
+    fn next(&mut self) -> Option<T> {
+        self.0.next()
     }
 }
 
-impl<T> Extend<T> for ExhaustiveSearch<T> {
-    fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
-        for value in iter {
-            self.push(value);
-        }
+impl<T> IntoIterator for ExhaustiveSearch<T> {
+    type Item = T;
+    type IntoIter = IntoIter<T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        IntoIter(self.0.into_iter())
     }
 }
 
-- 
cgit v1.2.3