diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 9f4bdaf3da3..9a625469140 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -98,7 +98,7 @@ use {Collection, MutableSeq}; use vec::Vec; pub use core::slice::{ref_slice, mut_ref_slice, Splits, Windows}; -pub use core::slice::{Chunks, Slice, ImmutableSlice, ImmutableEqSlice}; +pub use core::slice::{Chunks, Slice, ImmutableSlice, ImmutablePartialEqSlice}; pub use core::slice::{ImmutableOrdSlice, MutableSlice, Items, MutItems}; pub use core::slice::{MutSplits, MutChunks}; pub use core::slice::{bytes, MutableCloneableSlice}; diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs index 2d5c9c0e960..ead48092c4d 100644 --- a/src/libcore/prelude.rs +++ b/src/libcore/prelude.rs @@ -61,6 +61,6 @@ pub use str::{Str, StrSlice}; pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4}; pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8}; pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12}; -pub use slice::{ImmutableEqSlice, ImmutableOrdSlice}; +pub use slice::{ImmutablePartialEqSlice, ImmutableOrdSlice}; pub use slice::{MutableSlice}; pub use slice::{Slice, ImmutableSlice}; diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index b914a26d94c..e0088c4761b 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -773,7 +773,7 @@ impl<'a,T> MutableSlice<'a, T> for &'a mut [T] { } /// Extension methods for vectors contain `PartialEq` elements. -pub trait ImmutableEqSlice { +pub trait ImmutablePartialEqSlice { /// Find the first index containing a matching value fn position_elem(&self, t: &T) -> Option; @@ -790,7 +790,7 @@ pub trait ImmutableEqSlice { fn ends_with(&self, needle: &[T]) -> bool; } -impl<'a,T:PartialEq> ImmutableEqSlice for &'a [T] { +impl<'a,T:PartialEq> ImmutablePartialEqSlice for &'a [T] { #[inline] fn position_elem(&self, x: &T) -> Option { self.iter().position(|y| *x == *y) diff --git a/src/libstd/collections/hashmap.rs b/src/libstd/collections/hashmap.rs index 1bb92c487c6..b8f8bd41a2d 100644 --- a/src/libstd/collections/hashmap.rs +++ b/src/libstd/collections/hashmap.rs @@ -2743,7 +2743,7 @@ mod test_set { use prelude::*; use super::HashSet; - use slice::ImmutableEqSlice; + use slice::ImmutablePartialEqSlice; use collections::Collection; #[test] diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 6f148eea83c..6a00368f9a2 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -45,7 +45,7 @@ use path::{Path, GenericPath, BytesContainer}; use ptr::RawPtr; use ptr; use result::{Err, Ok, Result}; -use slice::{Slice, ImmutableSlice, MutableSlice, ImmutableEqSlice}; +use slice::{Slice, ImmutableSlice, MutableSlice, ImmutablePartialEqSlice}; use str::{Str, StrSlice, StrAllocating}; use string::String; use sync::atomic::{AtomicInt, INIT_ATOMIC_INT, SeqCst}; diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 16236c01472..d24c2e2266d 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -75,7 +75,7 @@ use str; use str::{MaybeOwned, Str, StrSlice}; use string::String; use slice::Slice; -use slice::{ImmutableEqSlice, ImmutableSlice}; +use slice::{ImmutablePartialEqSlice, ImmutableSlice}; use vec::Vec; /// Typedef for POSIX file paths. diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 321ec438c20..0a7817c3e00 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -22,7 +22,7 @@ use option::{Option, None, Some}; use str::Str; use str; use slice::{CloneableVector, Splits, Slice, VectorVector, - ImmutableEqSlice, ImmutableSlice}; + ImmutablePartialEqSlice, ImmutableSlice}; use vec::Vec; use super::{BytesContainer, GenericPath, GenericPathUnsafe}; diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 3d4ab66a94f..eb6dcc1f1a5 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -85,7 +85,7 @@ #[doc(no_inline)] pub use slice::{CloneableVector, ImmutableCloneableVector}; #[doc(no_inline)] pub use slice::{MutableCloneableSlice, MutableOrdSlice}; #[doc(no_inline)] pub use slice::{ImmutableSlice, MutableSlice}; -#[doc(no_inline)] pub use slice::{ImmutableEqSlice, ImmutableOrdSlice}; +#[doc(no_inline)] pub use slice::{ImmutablePartialEqSlice, ImmutableOrdSlice}; #[doc(no_inline)] pub use slice::{Slice, VectorVector}; #[doc(no_inline)] pub use slice::MutableSliceAllocating; #[doc(no_inline)] pub use string::String;