From 2c92ddeda7e2a8e9b6d6b629818eacdb96787575 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Thu, 1 Jan 2015 17:40:24 +1300 Subject: More fallout --- src/libcore/array.rs | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/libcore/array.rs') diff --git a/src/libcore/array.rs b/src/libcore/array.rs index 88e23377046..28563a60b61 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.rs @@ -26,33 +26,33 @@ macro_rules! array_impls { ($($N:expr)+) => { $( #[stable] - impl Clone for [T, ..$N] { - fn clone(&self) -> [T, ..$N] { + impl Clone for [T; $N] { + fn clone(&self) -> [T; $N] { *self } } #[unstable = "waiting for Show to stabilize"] - impl fmt::Show for [T, ..$N] { + impl fmt::Show for [T; $N] { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Show::fmt(&self[], f) } } #[stable] - impl PartialEq<[B, ..$N]> for [A, ..$N] where A: PartialEq { + impl PartialEq<[B; $N]> for [A; $N] where A: PartialEq { #[inline] - fn eq(&self, other: &[B, ..$N]) -> bool { + fn eq(&self, other: &[B; $N]) -> bool { self[] == other[] } #[inline] - fn ne(&self, other: &[B, ..$N]) -> bool { + fn ne(&self, other: &[B; $N]) -> bool { self[] != other[] } } #[stable] - impl<'a, A, B, Rhs> PartialEq for [A, ..$N] where + impl<'a, A, B, Rhs> PartialEq for [A; $N] where A: PartialEq, Rhs: Deref<[B]>, { @@ -63,47 +63,47 @@ macro_rules! array_impls { } #[stable] - impl<'a, A, B, Lhs> PartialEq<[B, ..$N]> for Lhs where + impl<'a, A, B, Lhs> PartialEq<[B; $N]> for Lhs where A: PartialEq, Lhs: Deref<[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[]) } #[inline(always)] - fn ne(&self, other: &[B, ..$N]) -> bool { PartialEq::ne(&**self, other[]) } + fn ne(&self, other: &[B; $N]) -> bool { PartialEq::ne(&**self, other[]) } } #[stable] - impl Eq for [T, ..$N] { } + impl Eq for [T; $N] { } #[stable] - impl PartialOrd for [T, ..$N] { + impl PartialOrd for [T; $N] { #[inline] - fn partial_cmp(&self, other: &[T, ..$N]) -> Option { + fn partial_cmp(&self, other: &[T; $N]) -> Option { PartialOrd::partial_cmp(&self[], &other[]) } #[inline] - fn lt(&self, other: &[T, ..$N]) -> bool { + fn lt(&self, other: &[T; $N]) -> bool { PartialOrd::lt(&self[], &other[]) } #[inline] - fn le(&self, other: &[T, ..$N]) -> bool { + fn le(&self, other: &[T; $N]) -> bool { PartialOrd::le(&self[], &other[]) } #[inline] - fn ge(&self, other: &[T, ..$N]) -> bool { + fn ge(&self, other: &[T; $N]) -> bool { PartialOrd::ge(&self[], &other[]) } #[inline] - fn gt(&self, other: &[T, ..$N]) -> bool { + fn gt(&self, other: &[T; $N]) -> bool { PartialOrd::gt(&self[], &other[]) } } #[stable] - impl Ord for [T, ..$N] { + impl Ord for [T; $N] { #[inline] - fn cmp(&self, other: &[T, ..$N]) -> Ordering { + fn cmp(&self, other: &[T; $N]) -> Ordering { Ord::cmp(&self[], &other[]) } } -- cgit 1.4.1-3-g733a5