about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-11-06 13:29:31 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-11-06 13:29:31 -0800
commit8a25e071e8ca281189663d23de5e317e87004a48 (patch)
tree7c83bb288da10504bed7fd159a7b557a73ae30bc /src/libstd/io
parent8ed288edb27fc83b15a549af69c82b5bb4f8ac1e (diff)
parenteec145be3f5e5f763e61749a6737f90df8504e05 (diff)
downloadrust-8a25e071e8ca281189663d23de5e317e87004a48.tar.gz
rust-8a25e071e8ca281189663d23de5e317e87004a48.zip
rollup merge of #18605 : Gankro/collect-fruit
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/mod.rs4
-rw-r--r--src/libstd/io/process.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index da5286b16ae..ba5034da5a8 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -627,7 +627,7 @@ pub trait Reader {
     /// as `Err(IoError)`. See `read()` for more details.
     fn push(&mut self, len: uint, buf: &mut Vec<u8>) -> IoResult<uint> {
         let start_len = buf.len();
-        buf.reserve_additional(len);
+        buf.reserve(len);
 
         let n = {
             let s = unsafe { slice_vec_capacity(buf, start_len, start_len + len) };
@@ -658,7 +658,7 @@ pub trait Reader {
         }
 
         let start_len = buf.len();
-        buf.reserve_additional(len);
+        buf.reserve(len);
 
         // we can't just use self.read_at_least(min, slice) because we need to push
         // successful reads onto the vector before any returned errors.
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index 493e1b559d7..698e0a3460f 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -1137,7 +1137,7 @@ mod tests {
         cmd.env("path", "foo");
         cmd.env("Path", "bar");
         let env = &cmd.env.unwrap();
-        let val = env.find(&EnvKey("PATH".to_c_str()));
+        let val = env.get(&EnvKey("PATH".to_c_str()));
         assert!(val.unwrap() == &"bar".to_c_str());
     }
 }