Skip to content

Commit 9e8158c

Browse files
committed
Update XmlReader::lookahead only in one place
If we would need to hook events reading, have a one place for that is preferable
1 parent 0f9d486 commit 9e8158c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/de/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,22 +2216,22 @@ impl<'i, R: XmlRead<'i>, E: EntityResolver> XmlReader<'i, R, E> {
22162216
let result1 = self.reader.read_to_end(name);
22172217
let result2 = self.reader.read_to_end(name);
22182218

2219-
// In case of error `next` returns `Eof`
2220-
self.lookahead = self.reader.next();
2219+
// In case of error `next_impl` returns `Eof`
2220+
let _ = self.next_impl();
22212221
result1?;
22222222
result2?;
22232223
}
22242224
// We pre-read event with the same name that is required to be skipped.
22252225
// Because this is end event, we already consume the whole tree, so
22262226
// nothing to do, just update lookahead
22272227
Ok(PayloadEvent::End(ref e)) if e.name() == name => {
2228-
self.lookahead = self.reader.next();
2228+
let _ = self.next_impl();
22292229
}
22302230
Ok(_) => {
22312231
let result = self.reader.read_to_end(name);
22322232

2233-
// In case of error `next` returns `Eof`
2234-
self.lookahead = self.reader.next();
2233+
// In case of error `next_impl` returns `Eof`
2234+
let _ = self.next_impl();
22352235
result?;
22362236
}
22372237
// Read next lookahead event, unpack error from the current lookahead

0 commit comments

Comments
 (0)