openpgp: Return impl Iterator instead of a concrete type

3 files changed, 9 insertions, 5 deletions

diff --git a/openpgp/src/packet/mod.rs b/openpgp/src/packet/mod.rs
index b5c3dd2c..d2422544 100644
--- a/openpgp/src/packet/mod.rs
+++ b/openpgp/src/packet/mod.rs
@@ -442,7 +442,7 @@ fn packet_path_iter() {
     use crate::parse::Parse;
     use crate::PacketPile;
 
-    fn paths(iter: slice::Iter<Packet>) -> Vec<Vec<usize>> {
+    fn paths<'a>(iter: impl Iterator<Item=&'a Packet>) -> Vec<Vec<usize>> {
         let mut lpaths : Vec<Vec<usize>> = Vec::new();
         for (i, packet) in iter.enumerate() {
             let mut v = Vec::new();
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index 1b523227..4bcfc0f3 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -3253,7 +3253,8 @@ fn subpacket_test_2() {
 //                 }
 //             }
 //         }
-//     }
+    //     }
+    ()
 }
 
 #[test]
diff --git a/openpgp/src/packet_pile.rs b/openpgp/src/packet_pile.rs
index 3539623d..bd640aa5 100644
--- a/openpgp/src/packet_pile.rs
+++ b/openpgp/src/packet_pile.rs
@@ -1,6 +1,5 @@
 use std::convert::TryFrom;
 use std::fmt;
-use std::slice;
 use std::vec;
 use std::io;
 use std::path::Path;
@@ -306,12 +305,16 @@ impl PacketPile {
     }
 
     /// Returns an iterator over the top-level packets.
-    pub fn children<'a>(&'a self) -> slice::Iter<'a, Packet> {
+    pub fn children(&self)
+        -> impl Iterator<Item=&Packet> + ExactSizeIterator
+    {
         self.top_level.children().expect("toplevel is a container")
     }
 
     /// Returns an `IntoIter` over the top-level packets.
-    pub fn into_children(self) -> vec::IntoIter<Packet> {
+    pub fn into_children(self)
+        -> impl Iterator<Item=Packet> + ExactSizeIterator
+    {
         self.top_level.into_children().expect("toplevel is a container")
     }