summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-29 17:01:39 -0800
committerbors <bors@rust-lang.org>2014-01-29 17:01:39 -0800
commit704f93ff5e8a8079af4a16fe984fb9f84b347d11 (patch)
treec643c4ffb3c18a66be6181a2dbd6b795f9d36476 /src/libstd/io
parentf84b7291e7606b35e800070bd826e4c2e2154228 (diff)
parent2d60691eb7a7d2735837cadf05883b3abfcbc160 (diff)
downloadrust-704f93ff5e8a8079af4a16fe984fb9f84b347d11.tar.gz
rust-704f93ff5e8a8079af4a16fe984fb9f84b347d11.zip
auto merge of #11893 : Armavica/rust/copyable-cloneable, r=huonw
I found awkward to have `MutableCloneableVector` and `CloneableIterator` on the one hand, and `CopyableVector` etc. on the other hand.

The concerned traits are:
* `CopyableVector` --> `CloneableVector`
* `OwnedCopyableVector` --> `OwnedCloneableVector`
* `ImmutableCopyableVector` --> `ImmutableCloneableVector`
* `CopyableTuple` --> `CloneableTuple`
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/comm_adapters.rs2
-rw-r--r--src/libstd/io/mem.rs2
-rw-r--r--src/libstd/io/mod.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs
index 0acfa71e315..1eaa752d2a3 100644
--- a/src/libstd/io/comm_adapters.rs
+++ b/src/libstd/io/comm_adapters.rs
@@ -15,7 +15,7 @@ use cmp;
 use io;
 use option::{None, Option, Some};
 use super::{Reader, Writer};
-use vec::{bytes, CopyableVector, MutableVector, ImmutableVector};
+use vec::{bytes, CloneableVector, MutableVector, ImmutableVector};
 
 /// Allows reading from a port.
 ///
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 6c380be343c..c185951feca 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -17,7 +17,7 @@ use option::{Option, Some, None};
 use super::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, io_error,
             OtherIoError};
 use vec;
-use vec::{Vector, ImmutableVector, MutableVector, OwnedCopyableVector};
+use vec::{Vector, ImmutableVector, MutableVector, OwnedCloneableVector};
 
 /// Writes to an owned, growable byte vector
 ///
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 8531edeb2c6..cadcbdd51f5 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -302,7 +302,7 @@ use str::{StrSlice, OwnedStr};
 use to_str::ToStr;
 use uint;
 use unstable::finally::Finally;
-use vec::{OwnedVector, MutableVector, ImmutableVector, OwnedCopyableVector};
+use vec::{OwnedVector, MutableVector, ImmutableVector, OwnedCloneableVector};
 use vec;
 
 // Reexports