Skip to content

Commit 1f643fc

Browse files
author
bcoopers
committed
---
yaml --- r: 196021 b: refs/heads/beta c: 240734c h: refs/heads/master i: 196019: da7ea5f v: v3
1 parent d5539ff commit 1f643fc

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3030
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3131
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32-
refs/heads/beta: 8d3e55908ae0e51f04c170133c9f9739886b8e2e
32+
refs/heads/beta: 240734c31e529557583a0dc8e97abf858b4a375d
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3535
refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511

branches/beta/src/libstd/io/mod.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,14 @@ fn append_to_string<F>(buf: &mut String, f: F) -> Result<usize>
101101
fn read_to_end<R: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize> {
102102
let start_len = buf.len();
103103
let mut len = start_len;
104-
let min_cap_bump = 16;
104+
let mut new_write_size = 16;
105105
let ret;
106106
loop {
107107
if len == buf.len() {
108-
if buf.capacity() == buf.len() {
109-
// reserve() rounds up our request such that every request
110-
// (with maybe the exception of the first request) for the
111-
// same amount of space doubles our capacity.
112-
buf.reserve(min_cap_bump);
108+
if new_write_size < DEFAULT_BUF_SIZE {
109+
new_write_size *= 2;
113110
}
114-
let new_area = buf.capacity() - buf.len();
115-
buf.extend(iter::repeat(0).take(new_area));
111+
buf.extend(iter::repeat(0).take(new_write_size));
116112
}
117113

118114
match r.read(&mut buf[len..]) {

0 commit comments

Comments
 (0)