about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2014-10-05 12:22:42 +1300
committerNick Cameron <ncameron@mozilla.com>2014-10-07 15:49:53 +1300
commitcd21e4a72c0175d226acc837d1886cfdfa40fe68 (patch)
treeb9860886daf57e5ce87e8863208e4ab0a3e947bb /src/libstd/io
parent2d3823441fe5324f747f7bf51ffc07b9434f827f (diff)
downloadrust-cd21e4a72c0175d226acc837d1886cfdfa40fe68.tar.gz
rust-cd21e4a72c0175d226acc837d1886cfdfa40fe68.zip
Rename slice::Slice
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 a93f9826fa5..57741db5ae2 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -23,7 +23,7 @@ use num::Int;
 use option::{Option, Some, None};
 use ptr::RawPtr;
 use result::{Ok, Err};
-use slice::{ImmutableSlice, Slice};
+use slice::{ImmutableSlice, AsSlice};
 
 /// An iterator that reads a single byte on each iteration,
 /// until `.read_byte()` returns `EndOfFile`.
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index ca9692ee158..0f8e0ed52f8 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::Slice;
+use slice::AsSlice;
 use vec::Vec;
 
 static BUF_CAPACITY: uint = 128;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index d279b88a1c5..280aff71e23 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::{Slice, ImmutableSlice};
+use slice::{AsSlice, ImmutableSlice};
 use str::{Str, StrSlice};
 use str;
 use string::String;