From 75af81234fd20224544c032560bfc47e89887b1c Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sun, 26 Apr 2015 08:43:45 -0700 Subject: [PATCH] LineColIterator doesn't need to be peekable. --- src/iterator.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/iterator.rs b/src/iterator.rs index 521a15e8..0efe66c0 100644 --- a/src/iterator.rs +++ b/src/iterator.rs @@ -1,8 +1,7 @@ -use std::iter::Peekable; use std::io; pub struct LineColIterator>> { - rdr: Peekable, + rdr: Iter, line: usize, col: usize, } @@ -12,14 +11,7 @@ impl>> LineColIterator { LineColIterator { line: 1, col: 0, - rdr: iter.peekable(), - } - } - fn peek(&mut self) -> Option { - match self.rdr.peek() { - None => None, - Some(&Ok(c)) => Some(c), - Some(&Err(_)) => None, + rdr: iter, } } pub fn line(&self) -> usize { self.line }