changeset 23:0620fcdadb9b

Remove superfluous IntoIterator type for WLR
author Lewin Bormann <lbo@spheniscida.de>
date Sun, 31 Jan 2016 14:28:07 +0000
parents 63d1a6b2dfda
children 64d2dfde95a5
files src/formats/writelog.rs
diffstat 1 files changed, 2 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/formats/writelog.rs	Sun Jan 31 14:11:06 2016 +0000
+++ b/src/formats/writelog.rs	Sun Jan 31 14:28:07 2016 +0000
@@ -10,8 +10,6 @@
 use std::vec;
 use std::string;
 
-use mapreducer::Record;
-use formats::util::RecordIterator;
 use formats::util::MRSinkGenerator;
 
 /// A length-prefixed record stream named for the original use case,
@@ -242,15 +240,10 @@
     }
 }
 
-/// Iterator type for WriteLogReader; used to implement IntoIterator
-pub struct IntoIter {
-    wlr: WriteLogReader,
-}
-
-impl Iterator for IntoIter {
+impl Iterator for WriteLogReader {
     type Item = String;
     fn next(&mut self) -> Option<String> {
-        let result = self.wlr.read_vec();
+        let result = self.read_vec();
         let convert_result;
 
         match result {
@@ -265,14 +258,6 @@
     }
 }
 
-impl IntoIterator for WriteLogReader {
-    type Item = Record;
-    type IntoIter = RecordIterator<IntoIter>;
-    fn into_iter(self) -> Self::IntoIter {
-        RecordIterator::new(IntoIter { wlr: self })
-    }
-}
-
 impl Read for WriteLogReader {
     fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
         let mut lengthbuf = [0; 4];