From fbc93082ec92c3534c4b27fef35d78d97bd77fd2 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 6 Aug 2014 20:03:55 -0700 Subject: 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] --- src/libstd/io/extensions.rs | 2 +- src/libstd/io/mem.rs | 2 +- src/libstd/io/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/io') 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; -- cgit 1.4.1-3-g733a5