From fdb752700c20b3ce841fed9f8ebf931a163cb221 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Sat, 30 Dec 2023 18:00:47 -0700
Subject: [PATCH] hybrid-array: unconditional `ArrayOps`/`AssociatedArraySize`
 impls (#1013)

Makes these traits always impl'd for `[T; N]` and `Array<T, U>`
respectively.
---
 hybrid-array/src/impls.rs |  4 ----
 hybrid-array/src/lib.rs   | 15 +++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hybrid-array/src/impls.rs b/hybrid-array/src/impls.rs
index f578b1d8..efc215e0 100644
--- a/hybrid-array/src/impls.rs
+++ b/hybrid-array/src/impls.rs
@@ -51,10 +51,6 @@ macro_rules! impl_array_size {
             impl<T> AssociatedArraySize for [T; $len] {
                 type Size = typenum::$ty;
             }
-
-            impl<T> AssociatedArraySize for Array<T, typenum::$ty> {
-                type Size = typenum::$ty;
-            }
         )+
      };
 }
diff --git a/hybrid-array/src/lib.rs b/hybrid-array/src/lib.rs
index 2df096c2..9ede91de 100644
--- a/hybrid-array/src/lib.rs
+++ b/hybrid-array/src/lib.rs
@@ -572,8 +572,7 @@ fn check_slice_length<T, U: ArraySize>(slice: &[T]) -> Result<(), TryFromSliceEr
 
 /// Array operations which are const generic over a given array size.
 pub trait ArrayOps<T, const N: usize>:
-    AssociatedArraySize
-    + Borrow<[T; N]>
+    Borrow<[T; N]>
     + BorrowMut<[T; N]>
     + From<[T; N]>
     + FromFn<T>
@@ -609,10 +608,7 @@ pub trait ArrayOps<T, const N: usize>:
         F: FnMut(T) -> U;
 }
 
-impl<T, const N: usize> ArrayOps<T, N> for [T; N]
-where
-    Self: AssociatedArraySize,
-{
+impl<T, const N: usize> ArrayOps<T, N> for [T; N] {
     const SIZE: usize = N;
 
     #[inline]
@@ -703,6 +699,13 @@ pub trait AssociatedArraySize: Sized {
     type Size: ArraySize;
 }
 
+impl<T, U> AssociatedArraySize for Array<T, U>
+where
+    U: ArraySize,
+{
+    type Size = U;
+}
+
 /// Construct an array type from the given function.
 pub trait FromFn<T>: Sized {
     /// Create array using the given callback function for each element.