parent
45cbdec417
commit
f7c1771fd1
@ -638,7 +638,7 @@ shr_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64)
|
||||
* ```
|
||||
*/
|
||||
#[lang="index"]
|
||||
pub trait Index<Index, Sized? Result> {
|
||||
pub trait Index<Index, Sized? Result> for Sized? {
|
||||
/// The method for the indexing (`Foo[Bar]`) operation
|
||||
fn index<'a>(&'a self, index: &Index) -> &'a Result;
|
||||
}
|
||||
@ -669,7 +669,7 @@ pub trait Index<Index, Sized? Result> {
|
||||
* ```
|
||||
*/
|
||||
#[lang="index_mut"]
|
||||
pub trait IndexMut<Index, Result> {
|
||||
pub trait IndexMut<Index, Result> for Sized? {
|
||||
/// The method for the indexing (`Foo[Bar]`) operation
|
||||
fn index_mut<'a>(&'a mut self, index: &Index) -> &'a mut Result;
|
||||
}
|
||||
|
@ -256,7 +256,6 @@ pub trait SlicePrelude<T> for Sized? {
|
||||
#[inline]
|
||||
#[experimental = "not triaged yet"]
|
||||
fn is_empty(&self) -> bool { self.len() == 0 }
|
||||
|
||||
/// Returns a mutable reference to the element at the given index,
|
||||
/// or `None` if the index is out of bounds
|
||||
#[unstable = "waiting on final error conventions"]
|
||||
@ -698,6 +697,22 @@ impl<T> SlicePrelude<T> for [T] {
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> ops::Index<uint, T> for [T] {
|
||||
fn index(&self, &index: &uint) -> &T {
|
||||
assert!(index < self.len());
|
||||
|
||||
unsafe { mem::transmute(self.repr().data.offset(index as int)) }
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> ops::IndexMut<uint, T> for [T] {
|
||||
fn index_mut(&mut self, &index: &uint) -> &mut T {
|
||||
assert!(index < self.len());
|
||||
|
||||
unsafe { mem::transmute(self.repr().data.offset(index as int)) }
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> ops::Slice<uint, [T]> for [T] {
|
||||
#[inline]
|
||||
fn as_slice_<'a>(&'a self) -> &'a [T] {
|
||||
|
Loading…
x
Reference in New Issue
Block a user