Replace full slice notation with index calls
This commit is contained in:
@@ -18,7 +18,7 @@ use clone::Clone;
|
||||
use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
|
||||
use fmt;
|
||||
use kinds::Copy;
|
||||
use ops::Deref;
|
||||
use ops::{Deref, FullRange, Index};
|
||||
use option::Option;
|
||||
|
||||
// macro for implementing n-ary tuple functions and operations
|
||||
@@ -35,7 +35,7 @@ macro_rules! array_impls {
|
||||
#[unstable = "waiting for Show to stabilize"]
|
||||
impl<T:fmt::Show> fmt::Show for [T; $N] {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
fmt::Show::fmt(&self[], f)
|
||||
fmt::Show::fmt(&self.index(&FullRange), f)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,11 +43,11 @@ macro_rules! array_impls {
|
||||
impl<A, B> PartialEq<[B; $N]> for [A; $N] where A: PartialEq<B> {
|
||||
#[inline]
|
||||
fn eq(&self, other: &[B; $N]) -> bool {
|
||||
self[] == other[]
|
||||
self.index(&FullRange) == other.index(&FullRange)
|
||||
}
|
||||
#[inline]
|
||||
fn ne(&self, other: &[B; $N]) -> bool {
|
||||
self[] != other[]
|
||||
self.index(&FullRange) != other.index(&FullRange)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,9 +57,9 @@ macro_rules! array_impls {
|
||||
Rhs: Deref<Target=[B]>,
|
||||
{
|
||||
#[inline(always)]
|
||||
fn eq(&self, other: &Rhs) -> bool { PartialEq::eq(self[], &**other) }
|
||||
fn eq(&self, other: &Rhs) -> bool { PartialEq::eq(self.index(&FullRange), &**other) }
|
||||
#[inline(always)]
|
||||
fn ne(&self, other: &Rhs) -> bool { PartialEq::ne(self[], &**other) }
|
||||
fn ne(&self, other: &Rhs) -> bool { PartialEq::ne(self.index(&FullRange), &**other) }
|
||||
}
|
||||
|
||||
#[stable]
|
||||
@@ -68,9 +68,9 @@ macro_rules! array_impls {
|
||||
Lhs: Deref<Target=[A]>
|
||||
{
|
||||
#[inline(always)]
|
||||
fn eq(&self, other: &[B; $N]) -> bool { PartialEq::eq(&**self, other[]) }
|
||||
fn eq(&self, other: &[B; $N]) -> bool { PartialEq::eq(&**self, other.index(&FullRange)) }
|
||||
#[inline(always)]
|
||||
fn ne(&self, other: &[B; $N]) -> bool { PartialEq::ne(&**self, other[]) }
|
||||
fn ne(&self, other: &[B; $N]) -> bool { PartialEq::ne(&**self, other.index(&FullRange)) }
|
||||
}
|
||||
|
||||
#[stable]
|
||||
@@ -80,23 +80,23 @@ macro_rules! array_impls {
|
||||
impl<T:PartialOrd> PartialOrd for [T; $N] {
|
||||
#[inline]
|
||||
fn partial_cmp(&self, other: &[T; $N]) -> Option<Ordering> {
|
||||
PartialOrd::partial_cmp(&self[], &other[])
|
||||
PartialOrd::partial_cmp(&self.index(&FullRange), &other.index(&FullRange))
|
||||
}
|
||||
#[inline]
|
||||
fn lt(&self, other: &[T; $N]) -> bool {
|
||||
PartialOrd::lt(&self[], &other[])
|
||||
PartialOrd::lt(&self.index(&FullRange), &other.index(&FullRange))
|
||||
}
|
||||
#[inline]
|
||||
fn le(&self, other: &[T; $N]) -> bool {
|
||||
PartialOrd::le(&self[], &other[])
|
||||
PartialOrd::le(&self.index(&FullRange), &other.index(&FullRange))
|
||||
}
|
||||
#[inline]
|
||||
fn ge(&self, other: &[T; $N]) -> bool {
|
||||
PartialOrd::ge(&self[], &other[])
|
||||
PartialOrd::ge(&self.index(&FullRange), &other.index(&FullRange))
|
||||
}
|
||||
#[inline]
|
||||
fn gt(&self, other: &[T; $N]) -> bool {
|
||||
PartialOrd::gt(&self[], &other[])
|
||||
PartialOrd::gt(&self.index(&FullRange), &other.index(&FullRange))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ macro_rules! array_impls {
|
||||
impl<T:Ord> Ord for [T; $N] {
|
||||
#[inline]
|
||||
fn cmp(&self, other: &[T; $N]) -> Ordering {
|
||||
Ord::cmp(&self[], &other[])
|
||||
Ord::cmp(&self.index(&FullRange), &other.index(&FullRange))
|
||||
}
|
||||
}
|
||||
)+
|
||||
|
||||
Reference in New Issue
Block a user