forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(buffer): use vec macro in constructor, change trace logs

Browse Source
This commit is contained in:
Sean McArthur
2015-08-31 19:30:41 -07:00
parent 5e0b952a37
commit 93e6d29a5e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/buffer.rs
View File

@@ -19,13 +19,9 @@ impl<R: Read> BufReader<R> {
#[inline] #[inline]
pub fn with_capacity(rdr: R, cap: usize) -> BufReader<R> { pub fn with_capacity(rdr: R, cap: usize) -> BufReader<R> {
let mut buf = Vec::with_capacity(cap);
unsafe {
grow_zerofill(&mut buf, cap);
}
BufReader { BufReader {
inner: rdr, inner: rdr,
buf: buf, buf: vec![0; cap],
pos: 0, pos: 0,
cap: 0, cap: 0,
} }
@@ -40,9 +36,10 @@ impl<R: Read> BufReader<R> {
#[inline] #[inline]
pub fn get_buf(&self) -> &[u8] { pub fn get_buf(&self) -> &[u8] {
if self.pos < self.cap { 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] &self.buf[self.pos..self.cap]
} else { } else {
trace!("get_buf []");
&[] &[]
} }
} }
@@ -54,7 +51,7 @@ impl<R: Read> BufReader<R> {
pub fn read_into_buf(&mut self) -> io::Result<usize> { pub fn read_into_buf(&mut self) -> io::Result<usize> {
self.maybe_reserve(); self.maybe_reserve();
let v = &mut self.buf; 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() { if self.cap < v.capacity() {
let nread = try!(self.inner.read(&mut v[self.cap..])); let nread = try!(self.inner.read(&mut v[self.cap..]));
self.cap += nread; self.cap += nread;