diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-09-17 12:56:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-09-21 22:15:51 -0700 |
| commit | 0169218047dc989acf9ea25e3122b9c659acb6b3 (patch) | |
| tree | 8b1cd720a9e38c745359581e74d216a04e39e5ef /src/libstd/io | |
| parent | 087b9283a0ed8df68f47ab07a25e60bc6a3ca050 (diff) | |
| download | rust-0169218047dc989acf9ea25e3122b9c659acb6b3.tar.gz rust-0169218047dc989acf9ea25e3122b9c659acb6b3.zip | |
Fix fallout from Vec stabilization
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/comm_adapters.rs | 4 | ||||
| -rw-r--r-- | src/libstd/io/fs.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index f2ff5c7b5c2..0a969fc37c9 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -15,7 +15,7 @@ use comm::{Sender, Receiver}; use io; use option::{None, Option, Some}; use result::{Ok, Err}; -use slice::{bytes, MutableSlice, ImmutableSlice}; +use slice::{bytes, MutableSlice, ImmutableSlice, CloneableVector}; use str::StrSlice; use super::{Reader, Writer, IoResult}; use vec::Vec; @@ -118,7 +118,7 @@ impl Clone for ChanWriter { impl Writer for ChanWriter { fn write(&mut self, buf: &[u8]) -> IoResult<()> { - self.tx.send_opt(Vec::from_slice(buf)).map_err(|_| { + self.tx.send_opt(buf.to_vec()).map_err(|_| { io::IoError { kind: io::BrokenPipe, desc: "Pipe closed", diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index f912b3ee38f..b8e18fc44cb 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -61,7 +61,7 @@ use io::{IoResult, IoError, FileStat, SeekStyle, Seek, Writer, Reader}; use io::{Read, Truncate, SeekCur, SeekSet, ReadWrite, SeekEnd, Append}; use io::UpdateIoError; use io; -use iter::Iterator; +use iter::{Iterator, Extendable}; use kinds::Send; use libc; use option::{Some, None, Option}; @@ -688,7 +688,7 @@ impl Iterator<Path> for Directories { e, path.display())); match result { - Ok(dirs) => { self.stack.push_all_move(dirs); } + Ok(dirs) => { self.stack.extend(dirs.into_iter()); } Err(..) => {} } } |
