openpgp: Streamline iteration over MessageStructure.

  - Implement IntoIter and Deref to &'a [MessageLayer<'a>], drop the
    custom iteration structs.

2 files changed, 12 insertions, 25 deletions

diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 383b883e..fb7d0cf2 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -282,35 +282,22 @@ impl<'a> MessageStructure<'a> {
             panic!("cannot push to encryption or compression layer");
         }
     }
-
-    /// Iterates over the message structure.
-    pub fn iter(&self) -> MessageStructureIter {
-        MessageStructureIter(self.0.iter())
-    }
-
-    /// Iterates over the message structure.
-    pub fn into_iter(self) -> impl Iterator<Item = MessageLayer<'a>> {
-        MessageStructureIntoIter(self.0.into_iter())
-    }
 }
 
-/// Iterates over the message structure.
-pub struct MessageStructureIter<'a>(::std::slice::Iter<'a, MessageLayer<'a>>);
+impl<'a> std::ops::Deref for MessageStructure<'a> {
+    type Target = [MessageLayer<'a>];
 
-impl<'a> Iterator for MessageStructureIter<'a> {
-    type Item = &'a MessageLayer<'a>;
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
+    fn deref(&self) -> &Self::Target {
+        &self.0[..]
     }
 }
 
-/// Iterates over the message structure.
-struct MessageStructureIntoIter<'a>(::std::vec::IntoIter<MessageLayer<'a>>);
-
-impl<'a> Iterator for MessageStructureIntoIter<'a> {
+impl<'a> IntoIterator for MessageStructure<'a> {
     type Item = MessageLayer<'a>;
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
+    type IntoIter = std::vec::IntoIter<MessageLayer<'a>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
     }
 }
 
@@ -1816,7 +1803,7 @@ mod test {
             }
 
             fn check(&mut self, structure: MessageStructure) -> Result<()> {
-                assert_eq!(structure.iter().count(), 2);
+                assert_eq!(structure.len(), 2);
                 for (i, layer) in structure.into_iter().enumerate() {
                     match layer {
                         MessageLayer::SignatureGroup { results } => {
diff --git a/openpgp/src/policy.rs b/openpgp/src/policy.rs
index af676a69..22eb32ed 100644
--- a/openpgp/src/policy.rs
+++ b/openpgp/src/policy.rs
@@ -1178,7 +1178,7 @@ mod test {
 
             fn check(&mut self, structure: MessageStructure) -> Result<()>
             {
-                for layer in structure.iter() {
+                for layer in structure {
                     match layer {
                         MessageLayer::SignatureGroup { ref results } =>
                             for result in results {
@@ -1643,7 +1643,7 @@ mod test {
 
             fn check(&mut self, structure: MessageStructure) -> Result<()>
             {
-                for layer in structure.iter() {
+                for layer in structure {
                     match layer {
                         MessageLayer::SignatureGroup { ref results } =>
                             for result in results {