fixup! Add IntoIterator<Item = &Pk> for Descriptor

Author: stevenroose

src/descriptor/bare.rs

@@ -64,8 +64,8 @@ impl<Pk: MiniscriptKey> Bare<Pk> {
 }
 
 impl<'a, Pk: MiniscriptKey> IntoIterator for &'a Bare<Pk> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.ms.into_iter()
@@ -237,11 +237,11 @@ impl<Pk: MiniscriptKey> Pkh<Pk> {
 }
 
 impl<'a, Pk: MiniscriptKey> IntoIterator for &'a Pkh<Pk> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
-        Box::new(::std::iter::once(&self.pk))
+        Box::new(::std::iter::once(ForEach::Key(&self.pk)))
     }
 }
 

src/descriptor/mod.rs

@@ -301,8 +301,8 @@ impl<Pk: MiniscriptKey> Descriptor<Pk> {
 }
 
 impl<'a, Pk: MiniscriptKey> IntoIterator for &'a Descriptor<Pk> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
         match *self {

src/descriptor/segwitv0.rs

@@ -79,8 +79,8 @@ impl<Pk: MiniscriptKey> Wsh<Pk> {
 }
 
 impl<'a, Pk: MiniscriptKey> IntoIterator for &'a Wsh<Pk> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
         match self.inner {
@@ -328,11 +328,11 @@ impl<Pk: MiniscriptKey> Wpkh<Pk> {
 }
 
 impl<'a, Pk: MiniscriptKey> IntoIterator for &'a Wpkh<Pk> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
-        Box::new(::std::iter::once(&self.pk))
+        Box::new(::std::iter::once(ForEach::Key(&self.pk)))
     }
 }
 

src/descriptor/sh.rs

@@ -194,8 +194,8 @@ impl<Pk: MiniscriptKey> Sh<Pk> {
 }
 
 impl<'a, Pk: MiniscriptKey> IntoIterator for &'a Sh<Pk> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
         match self.inner {

src/descriptor/sortedmulti.rs

@@ -107,11 +107,11 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
 }
 
 impl<'a, Pk: MiniscriptKey, Ctx: ScriptContext> IntoIterator for &'a SortedMultiVec<Pk, Ctx> {
-    type Item = &'a Pk;
-    type IntoIter = Box<dyn Iterator<Item = &'a Pk> + 'a>;
+    type Item = ForEach<'a, Pk>;
+    type IntoIter = Box<dyn Iterator<Item = ForEach<'a, Pk>> + 'a>;
 
     fn into_iter(self) -> Self::IntoIter {
-        Box::new(self.pks.iter())
+        Box::new(self.pks.iter().map(|pk| ForEach::Key(pk)))
     }
 }