From 52e06c663cb25308c1784b2263b93f4af32107c2 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 9 Jan 2014 21:03:18 -0800 Subject: [PATCH] Add eof to MemReader and BufReader It's easy to figure out and useful as a sanity check sometimes. --- src/libstd/io/mem.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 53aa176134d..f036131d211 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -111,6 +111,11 @@ impl MemReader { } } + /// Tests whether this reader has read all bytes in its buffer. + /// + /// If `true`, then this will no longer return bytes from `read`. + pub fn eof(&self) -> bool { self.pos == self.buf.len() } + /// Acquires an immutable reference to the underlying buffer of this /// `MemReader`. /// @@ -124,7 +129,7 @@ impl MemReader { impl Reader for MemReader { fn read(&mut self, buf: &mut [u8]) -> Option { - if self.pos == self.buf.len() { return None } + if self.eof() { return None } let write_len = min(buf.len(), self.buf.len() - self.pos); { @@ -216,11 +221,16 @@ impl<'a> BufReader<'a> { pos: 0 } } + + /// Tests whether this reader has read all bytes in its buffer. + /// + /// If `true`, then this will no longer return bytes from `read`. + pub fn eof(&self) -> bool { self.pos == self.buf.len() } } impl<'a> Reader for BufReader<'a> { fn read(&mut self, buf: &mut [u8]) -> Option { - if self.pos == self.buf.len() { return None } + if self.eof() { return None } let write_len = min(buf.len(), self.buf.len() - self.pos); {