Skip to content

Commit 2da3969

Browse files
author
bcoopers
committed
---
yaml --- r: 195545 b: refs/heads/master c: 240734c h: refs/heads/master i: 195543: c079f3d v: v3
1 parent 881961b commit 2da3969

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8d3e55908ae0e51f04c170133c9f9739886b8e2e
2+
refs/heads/master: 240734c31e529557583a0dc8e97abf858b4a375d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b3317d68910900f135f9f38e43a7a699bc736b4a
55
refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/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)