Skip to content

Commit cd21e4a

Browse files
nrcnrc
committed
Rename slice::Slice
1 parent 2d38234 commit cd21e4a

File tree

22 files changed

+30
-68
lines changed

22 files changed

+30
-68
lines changed

‎src/libcollections/hash/sip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ mod tests {
273273

274274
use str::Str;
275275
use string::String;
276-
use slice::{Slice, ImmutableSlice};
276+
use slice::{AsSlice, ImmutableSlice};
277277
use vec::Vec;
278278

279279
use super::super::{Hash, Writer};

‎src/libcollections/slice.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ use core::iter::{range_step, MultiplicativeIterator};
9898
use MutableSeq;
9999
use vec::Vec;
100100

101-
pub use core::slice::{Chunks, Slice, ImmutableSlice, ImmutablePartialEqSlice};
101+
pub use core::slice::{Chunks, AsSlice, ImmutableSlice, ImmutablePartialEqSlice};
102102
pub use core::slice::{ImmutableOrdSlice, MutableSlice, Items, MutItems};
103103
pub use core::slice::{MutSplits, MutChunks, Splits};
104104
pub use core::slice::{bytes, mut_ref_slice, ref_slice, MutableCloneableSlice};
@@ -117,7 +117,7 @@ pub trait VectorVector<T> {
117117
fn connect_vec(&self, sep: &T) -> Vec<T>;
118118
}
119119

120-
impl<'a, T: Clone, V: Slice<T>> VectorVector<T> for &'a [V] {
120+
impl<'a, T: Clone, V: AsSlice<T>> VectorVector<T> for &'a [V] {
121121
fn concat_vec(&self) -> Vec<T> {
122122
let size = self.iter().fold(0u, |acc, v| acc + v.as_slice().len());
123123
let mut result = Vec::with_capacity(size);

‎src/libcollections/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ use core::iter::AdditiveIterator;
6161
use core::mem;
6262
use core::prelude::{Char, Clone, Collection, Eq, Equiv, ImmutableSlice};
6363
use core::prelude::{Iterator, MutableSlice, None, Option, Ord, Ordering};
64-
use core::prelude::{PartialEq, PartialOrd, Result, Slice, Some, Tuple2};
64+
use core::prelude::{PartialEq, PartialOrd, Result, AsSlice, Some, Tuple2};
6565
use core::prelude::{range};
6666

6767
use {Deque, MutableSeq};
@@ -880,7 +880,7 @@ mod tests {
880880
use {Collection, MutableSeq};
881881

882882
use super::*;
883-
use std::slice::{Slice, ImmutableSlice};
883+
use std::slice::{AsSlice, ImmutableSlice};
884884
use string::String;
885885
use vec::Vec;
886886

‎src/libcollections/vec.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl<T: PartialOrd> PartialOrd for Vec<T> {
547547
impl<T: Eq> Eq for Vec<T> {}
548548

549549
#[experimental]
550-
impl<T: PartialEq, V: Slice<T>> Equiv<V> for Vec<T> {
550+
impl<T: PartialEq, V: AsSlice<T>> Equiv<V> for Vec<T> {
551551
#[inline]
552552
fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() }
553553
}
@@ -1605,7 +1605,7 @@ impl<T: PartialEq> Vec<T> {
16051605
}
16061606
}
16071607

1608-
impl<T> Slice<T> for Vec<T> {
1608+
impl<T> AsSlice<T> for Vec<T> {
16091609
/// Returns a slice into `self`.
16101610
///
16111611
/// # Example
@@ -1623,7 +1623,7 @@ impl<T> Slice<T> for Vec<T> {
16231623
}
16241624
}
16251625

1626-
impl<T: Clone, V: Slice<T>> Add<V, Vec<T>> for Vec<T> {
1626+
impl<T: Clone, V: AsSlice<T>> Add<V, Vec<T>> for Vec<T> {
16271627
#[inline]
16281628
fn add(&self, rhs: &V) -> Vec<T> {
16291629
let mut res = Vec::with_capacity(self.len() + rhs.as_slice().len());

‎src/libcore/fmt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use option::{Option, Some, None};
2222
use ops::Deref;
2323
use result::{Ok, Err};
2424
use result;
25-
use slice::{Slice, ImmutableSlice};
25+
use slice::{AsSlice, ImmutableSlice};
2626
use slice;
2727
use str::StrSlice;
2828
use str;

‎src/libcore/option.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSize};
149149
use mem;
150150
use result::{Result, Ok, Err};
151151
use slice;
152-
use slice::Slice;
153152

154153
// Note that this is not a lang item per se, but it has a hidden dependency on
155154
// `Iterator`, which is one. The compiler assumes that the `next` method of
@@ -846,21 +845,6 @@ impl<T: Default> Option<T> {
846845
// Trait implementations
847846
/////////////////////////////////////////////////////////////////////////////
848847

849-
impl<T> Slice<T> for Option<T> {
850-
/// Convert from `Option<T>` to `&[T]` (without copying)
851-
#[inline]
852-
#[stable]
853-
fn as_slice<'a>(&'a self) -> &'a [T] {
854-
match *self {
855-
Some(ref x) => slice::ref_slice(x),
856-
None => {
857-
let result: &[_] = &[];
858-
result
859-
}
860-
}
861-
}
862-
}
863-
864848
impl<T> Default for Option<T> {
865849
#[inline]
866850
fn default() -> Option<T> { None }

‎src/libcore/prelude.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,4 @@ pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
6262
pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
6363
pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};
6464
pub use slice::{ImmutablePartialEqSlice, ImmutableOrdSlice};
65-
pub use slice::{MutableSlice};
66-
pub use slice::{Slice, ImmutableSlice};
65+
pub use slice::{AsSlice, ImmutableSlice, MutableSlice};

‎src/libcore/result.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ use clone::Clone;
280280
use cmp::PartialEq;
281281
use std::fmt::Show;
282282
use slice;
283-
use slice::Slice;
284283
use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSize};
285284
use option::{None, Option, Some};
286285

@@ -840,26 +839,6 @@ impl<T: Show, E> Result<T, E> {
840839
}
841840
}
842841

843-
/////////////////////////////////////////////////////////////////////////////
844-
// Trait implementations
845-
/////////////////////////////////////////////////////////////////////////////
846-
847-
impl<T, E> Slice<T> for Result<T, E> {
848-
/// Convert from `Result<T, E>` to `&[T]` (without copying)
849-
#[inline]
850-
#[stable]
851-
fn as_slice<'a>(&'a self) -> &'a [T] {
852-
match *self {
853-
Ok(ref x) => slice::ref_slice(x),
854-
Err(_) => {
855-
// work around lack of implicit coercion from fixed-size array to slice
856-
let emp: &[_] = &[];
857-
emp
858-
}
859-
}
860-
}
861-
}
862-
863842
/////////////////////////////////////////////////////////////////////////////
864843
// The Result Iterator
865844
/////////////////////////////////////////////////////////////////////////////

‎src/libcore/slice.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,13 +1143,13 @@ impl<'a, T:Clone> MutableCloneableSlice<T> for &'a mut [T] {
11431143

11441144
/// Data that is viewable as a slice.
11451145
#[unstable = "may merge with other traits"]
1146-
pub trait Slice<T> {
1146+
pub trait AsSlice<T> {
11471147
/// Work with `self` as a slice.
11481148
fn as_slice<'a>(&'a self) -> &'a [T];
11491149
}
11501150

11511151
#[unstable = "trait is unstable"]
1152-
impl<'a,T> Slice<T> for &'a [T] {
1152+
impl<'a,T> AsSlice<T> for &'a [T] {
11531153
#[inline(always)]
11541154
fn as_slice<'a>(&'a self) -> &'a [T] { *self }
11551155
}
@@ -1828,7 +1828,7 @@ impl<'a,T:PartialEq> PartialEq for &'a [T] {
18281828
impl<'a,T:Eq> Eq for &'a [T] {}
18291829

18301830
#[unstable = "waiting for DST"]
1831-
impl<'a,T:PartialEq, V: Slice<T>> Equiv<V> for &'a [T] {
1831+
impl<'a,T:PartialEq, V: AsSlice<T>> Equiv<V> for &'a [T] {
18321832
#[inline]
18331833
fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() }
18341834
}
@@ -1849,7 +1849,7 @@ impl<'a,T:PartialEq> PartialEq for &'a mut [T] {
18491849
impl<'a,T:Eq> Eq for &'a mut [T] {}
18501850

18511851
#[unstable = "waiting for DST"]
1852-
impl<'a,T:PartialEq, V: Slice<T>> Equiv<V> for &'a mut [T] {
1852+
impl<'a,T:PartialEq, V: AsSlice<T>> Equiv<V> for &'a mut [T] {
18531853
#[inline]
18541854
fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() }
18551855
}

‎src/libgraphviz/maybe_owned_vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<'a, T: Ord> Ord for MaybeOwnedVector<'a, T> {
8484
}
8585
}
8686

87-
impl<'a, T: PartialEq, V: Slice<T>> Equiv<V> for MaybeOwnedVector<'a, T> {
87+
impl<'a, T: PartialEq, V: AsSlice<T>> Equiv<V> for MaybeOwnedVector<'a, T> {
8888
fn equiv(&self, other: &V) -> bool {
8989
self.as_slice() == other.as_slice()
9090
}
@@ -99,7 +99,7 @@ impl<'a, T: PartialEq, V: Slice<T>> Equiv<V> for MaybeOwnedVector<'a, T> {
9999
// In any case, with `Vector` in place, the client can just use
100100
// `as_slice` if they prefer that over `match`.
101101

102-
impl<'b,T> Slice<T> for MaybeOwnedVector<'b,T> {
102+
impl<'b,T> AsSlice<T> for MaybeOwnedVector<'b,T> {
103103
fn as_slice<'a>(&'a self) -> &'a [T] {
104104
match self {
105105
&Growable(ref v) => v.as_slice(),

‎src/libstd/ascii.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use fmt;
1919
use iter::Iterator;
2020
use mem;
2121
use option::{Option, Some, None};
22-
use slice::{ImmutableSlice, MutableSlice, Slice};
22+
use slice::{ImmutableSlice, MutableSlice, AsSlice};
2323
use str::{Str, StrSlice};
2424
use string::{mod, String};
2525
use to_string::IntoStr;

‎src/libstd/c_vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use option::{Option, Some, None};
4343
use ptr::RawPtr;
4444
use ptr;
4545
use raw;
46-
use slice::Slice;
46+
use slice::AsSlice;
4747

4848
/// The type representing a foreign chunk of memory
4949
pub struct CVec<T> {
@@ -145,7 +145,7 @@ impl<T> CVec<T> {
145145
}
146146
}
147147

148-
impl<T> Slice<T> for CVec<T> {
148+
impl<T> AsSlice<T> for CVec<T> {
149149
/// View the stored data as a slice.
150150
fn as_slice<'a>(&'a self) -> &'a [T] {
151151
unsafe {

‎src/libstd/dynamic_lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use option::*;
2929
use os;
3030
use path::{Path,GenericPath};
3131
use result::*;
32-
use slice::{Slice,ImmutableSlice};
32+
use slice::{AsSlice,ImmutableSlice};
3333
use str;
3434
use string::String;
3535
use vec::Vec;

‎src/libstd/io/extensions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use num::Int;
2323
use option::{Option, Some, None};
2424
use ptr::RawPtr;
2525
use result::{Ok, Err};
26-
use slice::{ImmutableSlice, Slice};
26+
use slice::{ImmutableSlice, AsSlice};
2727

2828
/// An iterator that reads a single byte on each iteration,
2929
/// until `.read_byte()` returns `EndOfFile`.

‎src/libstd/io/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use result::{Err, Ok};
1919
use io;
2020
use io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult};
2121
use slice;
22-
use slice::Slice;
22+
use slice::AsSlice;
2323
use vec::Vec;
2424

2525
static BUF_CAPACITY: uint = 128;

‎src/libstd/io/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ use os;
235235
use boxed::Box;
236236
use result::{Ok, Err, Result};
237237
use rt::rtio;
238-
use slice::{Slice, ImmutableSlice};
238+
use slice::{AsSlice, ImmutableSlice};
239239
use str::{Str, StrSlice};
240240
use str;
241241
use string::String;

‎src/libstd/os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use path::{Path, GenericPath, BytesContainer};
4545
use ptr::RawPtr;
4646
use ptr;
4747
use result::{Err, Ok, Result};
48-
use slice::{Slice, ImmutableSlice, MutableSlice, ImmutablePartialEqSlice};
48+
use slice::{AsSlice, ImmutableSlice, MutableSlice, ImmutablePartialEqSlice};
4949
use slice::CloneableVector;
5050
use str::{Str, StrSlice, StrAllocating};
5151
use string::String;

‎src/libstd/path/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ use option::{Option, None, Some};
7676
use str;
7777
use str::{MaybeOwned, Str, StrSlice};
7878
use string::String;
79-
use slice::{Slice, CloneableVector};
79+
use slice::{AsSlice, CloneableVector};
8080
use slice::{ImmutablePartialEqSlice, ImmutableSlice};
8181
use vec::Vec;
8282

‎src/libstd/path/posix.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use iter::{DoubleEndedIterator, AdditiveIterator, Extendable, Iterator, Map};
2121
use option::{Option, None, Some};
2222
use str::Str;
2323
use str;
24-
use slice::{CloneableVector, Splits, Slice, VectorVector,
24+
use slice::{CloneableVector, Splits, AsSlice, VectorVector,
2525
ImmutablePartialEqSlice, ImmutableSlice};
2626
use vec::Vec;
2727

@@ -367,7 +367,7 @@ impl Path {
367367

368368
/// Returns a normalized byte vector representation of a path, by removing all empty
369369
/// components, and unnecessary . and .. components.
370-
fn normalize<V: Slice<u8>+CloneableVector<u8>>(v: V) -> Vec<u8> {
370+
fn normalize<V: AsSlice<u8>+CloneableVector<u8>>(v: V) -> Vec<u8> {
371371
// borrowck is being very picky
372372
let val = {
373373
let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == SEP_BYTE;

‎src/libstd/path/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use io::Writer;
2323
use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Iterator, Map};
2424
use mem;
2525
use option::{Option, Some, None};
26-
use slice::{Slice, ImmutableSlice};
26+
use slice::{AsSlice, ImmutableSlice};
2727
use str::{CharSplits, Str, StrAllocating, StrVector, StrSlice};
2828
use string::String;
2929
use unicode::char::UnicodeChar;

‎src/libstd/prelude.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#[doc(no_inline)] pub use slice::{MutableCloneableSlice, MutableOrdSlice};
8888
#[doc(no_inline)] pub use slice::{ImmutableSlice, MutableSlice};
8989
#[doc(no_inline)] pub use slice::{ImmutablePartialEqSlice, ImmutableOrdSlice};
90-
#[doc(no_inline)] pub use slice::{Slice, VectorVector};
90+
#[doc(no_inline)] pub use slice::{AsSlice, VectorVector};
9191
#[doc(no_inline)] pub use slice::MutableSliceAllocating;
9292
#[doc(no_inline)] pub use string::String;
9393
#[doc(no_inline)] pub use vec::Vec;

‎src/libsyntax/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ fn mk_test_module(cx: &mut TestCtxt) -> (P<ast::Item>, Option<ast::ViewItem>) {
414414
let mainfn = (quote_item!(&mut cx.ext_cx,
415415
pub fn main() {
416416
#![main]
417-
use std::slice::Slice;
417+
use std::slice::AsSlice;
418418
test::test_main_static(::std::os::args().as_slice(), TESTS);
419419
}
420420
)).unwrap();

0 commit comments

Comments
 (0)