From 45c10db41f2af5919621ff69f5dc090cc917c1d3 Mon Sep 17 00:00:00 2001 From: bcoopers Date: Sun, 29 Mar 2015 19:08:53 -0400 Subject: [PATCH] Clarified and simplified algorithm for increasing size of buffer in read_to_end() --- src/libstd/io/mod.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 830a88bb6c95..3de9a0689262 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -101,15 +101,14 @@ fn append_to_string(buf: &mut String, f: F) -> Result fn read_to_end(r: &mut R, buf: &mut Vec) -> Result { let start_len = buf.len(); let mut len = start_len; - let mut cap_bump = 16; + let min_cap_bump = 16; let ret; loop { if len == buf.len() { if buf.capacity() == buf.len() { - if cap_bump < DEFAULT_BUF_SIZE { - cap_bump *= 2; - } - buf.reserve(cap_bump); + // reserve() rounds up our request to the nearest power of two, so after the first + // time the capacity is exceeded, we double our capacity at each call to reserve. + buf.reserve(min_cap_bump); } let new_area = buf.capacity() - buf.len(); buf.extend(iter::repeat(0).take(new_area));