From 93e6d29a5ed6f137f621741830f3d812f8d7d2b8 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Mon, 31 Aug 2015 19:30:41 -0700 Subject: [PATCH] refactor(buffer): use vec macro in constructor, change trace logs --- src/buffer.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/buffer.rs b/src/buffer.rs index 2dacbc12..f405591e 100644 --- a/src/buffer.rs +++ b/src/buffer.rs @@ -19,13 +19,9 @@ impl BufReader { #[inline] pub fn with_capacity(rdr: R, cap: usize) -> BufReader { - let mut buf = Vec::with_capacity(cap); - unsafe { - grow_zerofill(&mut buf, cap); - } BufReader { inner: rdr, - buf: buf, + buf: vec![0; cap], pos: 0, cap: 0, } @@ -40,9 +36,10 @@ impl BufReader { #[inline] pub fn get_buf(&self) -> &[u8] { if self.pos < self.cap { - trace!("slicing {:?}", (self.pos, self.cap, self.buf.len())); + trace!("get_buf [u8; {}][{}..{}]", self.buf.len(), self.pos, self.cap); &self.buf[self.pos..self.cap] } else { + trace!("get_buf []"); &[] } } @@ -54,7 +51,7 @@ impl BufReader { pub fn read_into_buf(&mut self) -> io::Result { self.maybe_reserve(); let v = &mut self.buf; - trace!("read_into_buf pos={}, cap={}", self.cap, v.capacity()); + trace!("read_into_buf buf[{}..{}]", self.cap, v.len()); if self.cap < v.capacity() { let nread = try!(self.inner.read(&mut v[self.cap..])); self.cap += nread;