From 25425310fdfdc76dd3804857257d862f81eb0134 Mon Sep 17 00:00:00 2001
From: Edward Barnard
Date: Fri, 28 Aug 2015 20:12:51 +0700
Subject: Remove Error variant from PlistEvent

---
 src/binary.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/binary.rs')

diff --git a/src/binary.rs b/src/binary.rs
index c189c1a..0f1b707 100644
--- a/src/binary.rs
+++ b/src/binary.rs
@@ -225,12 +225,13 @@ impl<R: Read+Seek> StreamingParser<R> {
 }
 
 impl<R: Read+Seek> Iterator for StreamingParser<R> {
-	type Item = PlistEvent;
+	type Item = ParserResult<PlistEvent>;
 
-	fn next(&mut self) -> Option<PlistEvent> {
+	fn next(&mut self) -> Option<ParserResult<PlistEvent>> {
 		match self.read_next() {
-			Ok(result) => result,
-			Err(err) => Some(PlistEvent::Error(err))
+			Ok(Some(result)) => Some(Ok(result)),
+			Err(err) => Some(Err(err)),
+			Ok(None) => None
 		}
 	}
 }
@@ -249,7 +250,7 @@ mod tests {
 
 		let reader = File::open(&Path::new("./tests/data/binary.plist")).unwrap();
 		let streaming_parser = StreamingParser::new(reader);
-		let events: Vec<PlistEvent> = streaming_parser.collect();
+		let events: Vec<PlistEvent> = streaming_parser.map(|e| e.unwrap()).collect();
 
 		let comparison = &[
 			StartPlist,
-- 
cgit v1.2.3