about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-08-06 20:03:55 -0700
committerBrian Anderson <banderson@mozilla.com>2014-08-13 11:30:14 -0700
commitfbc93082ec92c3534c4b27fef35d78d97bd77fd2 (patch)
treed5154fe0a4a461ce65f1dff659ac9117fb310e8d /src/libstd/io
parent4f5b6927e8e428239082ecc17b85a0506bcc9a65 (diff)
downloadrust-fbc93082ec92c3534c4b27fef35d78d97bd77fd2.tar.gz
rust-fbc93082ec92c3534c4b27fef35d78d97bd77fd2.zip
std: Rename slice::Vector to Slice
This required some contortions because importing both raw::Slice
and slice::Slice makes rustc crash.

Since `Slice` is in the prelude, this renaming is unlikely to
casue breakage.

[breaking-change]
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/extensions.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/extensions.rs b/src/libstd/io/extensions.rs
index c40ea749376..12caa715865 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -21,7 +21,7 @@ use option::{Option, Some, None};
 use result::{Ok, Err};
 use io;
 use io::{IoError, IoResult, Reader};
-use slice::{ImmutableSlice, Vector};
+use slice::{ImmutableSlice, Slice};
 use ptr::RawPtr;
 
 /// An iterator that reads a single byte on each iteration,
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index e6866f45948..ea9d08171e6 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -19,7 +19,7 @@ use result::{Err, Ok};
 use io;
 use io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult};
 use slice;
-use slice::{Vector, ImmutableSlice, MutableSlice};
+use slice::{Slice, ImmutableSlice, MutableSlice};
 use vec::Vec;
 
 static BUF_CAPACITY: uint = 128;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index fa21c108ea3..c95dd8618ed 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -235,7 +235,7 @@ use os;
 use boxed::Box;
 use result::{Ok, Err, Result};
 use rt::rtio;
-use slice::{Vector, MutableSlice, ImmutableSlice};
+use slice::{Slice, MutableSlice, ImmutableSlice};
 use str::{Str, StrSlice};
 use str;
 use string::String;