aboutsummaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/reader.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xml/reader.rs b/src/xml/reader.rs
index 091775e..b372e8e 100644
--- a/src/xml/reader.rs
+++ b/src/xml/reader.rs
@@ -51,7 +51,7 @@ impl<R: Read> StreamingParser<R> {
}
}
- fn next_inner(&mut self) -> Option<ParserResult<PlistEvent>> {
+ fn read_next(&mut self) -> Option<ParserResult<PlistEvent>> {
loop {
match self.next_event() {
XmlEvent::StartElement { name, .. } => {
@@ -127,16 +127,16 @@ impl<R: Read> Iterator for StreamingParser<R> {
if self.finished {
None
} else {
- match self.next_inner() {
- None => {
+ match self.read_next() {
+ Some(Ok(event)) => Some(Ok(event)),
+ Some(Err(err)) => {
self.finished = true;
- None
+ Some(Err(err))
},
- ret @ Some(Err(_)) => {
+ None => {
self.finished = true;
- ret
+ None
}
- ret => ret
}
}
}