about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2014-08-18 17:52:38 -0700
committerAaron Turon <aturon@mozilla.com>2014-08-28 09:12:54 -0700
commit276b8b125d3f60cebab702542b60207429fbb333 (patch)
tree022549e5a1b801df28b222d3bcd37194b997b849 /src/libstd
parent3a52ef4613f85fba1ecfd8746388bf34a5499bf9 (diff)
downloadrust-276b8b125d3f60cebab702542b60207429fbb333.tar.gz
rust-276b8b125d3f60cebab702542b60207429fbb333.zip
Fallout from stabilizing core::option
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/buffered.rs2
-rw-r--r--src/libstd/io/process.rs4
-rw-r--r--src/libstd/io/tempfile.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index 1d638e498d4..0c63f1a901f 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -182,7 +182,7 @@ impl<W: Writer> BufferedWriter<W> {
     pub fn unwrap(mut self) -> W {
         // FIXME(#12628): is failing the right thing to do if flushing fails?
         self.flush_buf().unwrap();
-        self.inner.take_unwrap()
+        self.inner.take().unwrap()
     }
 }
 
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index dd6c1f6016c..c1f4161fe18 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -54,7 +54,7 @@ use collections::HashMap;
 ///     Err(e) => fail!("failed to execute child: {}", e),
 /// };
 ///
-/// let contents = child.stdout.get_mut_ref().read_to_end();
+/// let contents = child.stdout.as_mut().unwrap().read_to_end();
 /// assert!(child.wait().unwrap().success());
 /// ```
 pub struct Process {
@@ -95,7 +95,7 @@ pub type EnvMap = HashMap<CString, CString>;
 ///   Err(e) => fail!("failed to execute process: {}", e),
 /// };
 ///
-/// let output = process.stdout.get_mut_ref().read_to_end();
+/// let output = process.stdout.as_mut().unwrap().read_to_end();
 /// ```
 #[deriving(Clone)]
 pub struct Command {
diff --git a/src/libstd/io/tempfile.rs b/src/libstd/io/tempfile.rs
index 2faa23a6aa0..8def5d5c997 100644
--- a/src/libstd/io/tempfile.rs
+++ b/src/libstd/io/tempfile.rs
@@ -70,7 +70,7 @@ impl TempDir {
     /// temporary directory is prevented.
     pub fn unwrap(self) -> Path {
         let mut tmpdir = self;
-        tmpdir.path.take_unwrap()
+        tmpdir.path.take().unwrap()
     }
 
     /// Access the wrapped `std::path::Path` to the temporary directory.