Remove SequenceItem, as it is unnecessary

Author: novacrazy

src/functional.rs

@@ -46,7 +46,7 @@ pub unsafe trait FunctionalSequence<T>: GenericSequence<T> {
     where
         Self: MappedGenericSequence<T, U>,
         Self::Length: ArrayLength<U>,
-        F: FnMut(SequenceItem<Self>) -> U,
+        F: FnMut(Self::Item) -> U,
     {
         FromIterator::from_iter(self.into_iter().map(f))
     }
@@ -63,7 +63,7 @@ pub unsafe trait FunctionalSequence<T>: GenericSequence<T> {
         Rhs: MappedGenericSequence<B, U, Mapped=MappedSequence<Self, T, U>>,
         Self::Length: ArrayLength<B> + ArrayLength<U>,
         Rhs: GenericSequence<B, Length=Self::Length>,
-        F: FnMut(SequenceItem<Self>, SequenceItem<Rhs>) -> U,
+        F: FnMut(Self::Item, Rhs::Item) -> U,
     {
         rhs.inverted_zip2(self, f)
     }
@@ -73,7 +73,7 @@ pub unsafe trait FunctionalSequence<T>: GenericSequence<T> {
     /// If the fold function panics, any unused elements will be dropped.
     fn fold<U, F>(self, init: U, f: F) -> U
     where
-        F: FnMut(U, SequenceItem<Self>) -> U,
+        F: FnMut(U, Self::Item) -> U,
     {
         self.into_iter().fold(init, f)
     }

src/lib.rs

@@ -330,7 +330,7 @@ where
         Lhs: GenericSequence<B, Length=Self::Length> + MappedGenericSequence<B, U>,
         Self: MappedGenericSequence<T, U>,
         Self::Length: ArrayLength<B> + ArrayLength<U>,
-        F: FnMut(SequenceItem<Lhs>, SequenceItem<Self>) -> U
+        F: FnMut(Lhs::Item, Self::Item) -> U
     {
         let mut right = ArrayConsumer::new(self);
 
@@ -385,7 +385,7 @@ where
         Rhs: MappedGenericSequence<B, U, Mapped=MappedSequence<Self, T, U>>,
         Self::Length: ArrayLength<B> + ArrayLength<U>,
         Rhs: GenericSequence<B, Length=Self::Length>,
-        F: FnMut(T, SequenceItem<Rhs>) -> U,
+        F: FnMut(T, Rhs::Item) -> U,
     {
         rhs.inverted_zip(self, f)
     }

src/sequence.rs

@@ -52,15 +52,12 @@ pub unsafe trait GenericSequence<T>: Sized + IntoIterator {
         Lhs: GenericSequence<B, Length=Self::Length> + MappedGenericSequence<B, U>,
         Self: MappedGenericSequence<T, U>,
         Self::Length: ArrayLength<B> + ArrayLength<U>,
-        F: FnMut(SequenceItem<Lhs>, SequenceItem<Self>) -> U
+        F: FnMut(Lhs::Item, Self::Item) -> U
     {
         FromIterator::from_iter(lhs.into_iter().zip(self.into_iter()).map(|(l, r)| f(l, r) ))
     }
 }
 
-/// Accessor type for iteration items from `GenericSequence`
-pub type SequenceItem<S> = <S as IntoIterator>::Item;
-
 unsafe impl<'a, T: 'a, S: GenericSequence<T>> GenericSequence<T> for &'a S
 where
     &'a S: IntoIterator

tests/mod.rs

@@ -279,8 +279,8 @@ fn test_fold() {
 fn sum_generic<S>(s: S) -> i32
 where
     S: FunctionalSequence<i32>,
-    SequenceItem<S>: Add<i32, Output=i32>, // `+`
-    i32: Add<SequenceItem<S>, Output=i32>, // reflexive
+    S::Item: Add<i32, Output=i32>, // `+`
+    i32: Add<S::Item, Output=i32>, // reflexive
 {
     s.fold(0, |a, x| a + x)
 }

tests/std.rs

@@ -12,7 +12,7 @@ use generic_array::functional::*;
 pub fn test_generic<S>(s: S)
 where
     S: FunctionalSequence<i32>,            // `.map`
-    SequenceItem<S>: Add<i32, Output=i32>, // `+`
+    S::Item: Add<i32, Output=i32>, // `+`
     S: MappedGenericSequence<i32, i32>,    // `i32` -> `i32`
     MappedSequence<S, i32, i32>: Debug     // println!
 {