From 276b8b125d3f60cebab702542b60207429fbb333 Mon Sep 17 00:00:00 2001 From: Aaron Turon Date: Mon, 18 Aug 2014 17:52:38 -0700 Subject: Fallout from stabilizing core::option --- src/libstd/io/buffered.rs | 2 +- src/libstd/io/process.rs | 4 ++-- src/libstd/io/tempfile.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libstd') 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 BufferedWriter { 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; /// 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. -- cgit 1.4.1-3-g733a5