File tree Expand file tree Collapse file tree 2 files changed +5
-9
lines changed
branches/beta/src/libstd/io Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
29
29
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
30
30
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
31
31
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32
- refs/heads/beta: 8d3e55908ae0e51f04c170133c9f9739886b8e2e
32
+ refs/heads/beta: 240734c31e529557583a0dc8e97abf858b4a375d
33
33
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
34
34
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35
35
refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511
Original file line number Diff line number Diff line change @@ -101,18 +101,14 @@ fn append_to_string<F>(buf: &mut String, f: F) -> Result<usize>
101
101
fn read_to_end < R : Read + ?Sized > ( r : & mut R , buf : & mut Vec < u8 > ) -> Result < usize > {
102
102
let start_len = buf. len ( ) ;
103
103
let mut len = start_len;
104
- let min_cap_bump = 16 ;
104
+ let mut new_write_size = 16 ;
105
105
let ret;
106
106
loop {
107
107
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 ;
113
110
}
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) ) ;
116
112
}
117
113
118
114
match r. read ( & mut buf[ len..] ) {
You can’t perform that action at this time.
0 commit comments