Merge branch 'main' into arrow-array

mbrobbel · Aug 7, 2023 · 42ba214 · 42ba214
2 parents 9494ce2 + b6b922c
commit 42ba214
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/array/mod.rs b/src/array/mod.rs
@@ -82,13 +82,6 @@ impl_array_type!(Option<f64>, FixedSizePrimitiveArray<f64, true, Buffer>);
 impl_array_type!((), NullArray<(), false, Buffer>);
 impl_array_type!(Option<()>, NullArray<(), true, Buffer>);
 
-impl<T: FixedSize> ArrayType for (T,) {
-    type Array<Buffer: BufferType> = FixedSizePrimitiveArray<(T,), false, Buffer>;
-}
-impl<T: FixedSize> ArrayType for Option<(T,)> {
-    type Array<Buffer: BufferType> = FixedSizePrimitiveArray<(T,), true, Buffer>;
-}
-
 impl<T: FixedSize, const N: usize> ArrayType for [T; N] {
     type Array<Buffer: BufferType> = FixedSizePrimitiveArray<[T; N], false, Buffer>;
 }

diff --git a/src/fixed_size.rs b/src/fixed_size.rs
@@ -1,7 +1,7 @@
 //! Subtrait for fixed-size types.
 
 use crate::array::ArrayType;
-use std::fmt::Debug;
+use std::{fmt::Debug, mem};
 
 /// Subtrait for fixed-size types.
 ///
@@ -13,7 +13,7 @@ use std::fmt::Debug;
 #[cfg(not(feature = "arrow-buffer"))]
 pub trait FixedSize: ArrayType + Copy + Debug + Sized + sealed::Sealed + 'static {
     /// The fixed-size of this type in bytes.
-    const SIZE: usize = std::mem::size_of::<Self>();
+    const SIZE: usize = mem::size_of::<Self>();
 }
 
 #[cfg(feature = "arrow-buffer")]
@@ -42,7 +42,6 @@ impl FixedSize for f32 {}
 impl FixedSize for f64 {}
 
 impl FixedSize for () {}
-impl<T: FixedSize> FixedSize for (T,) {}
 
 impl<const N: usize, T: FixedSize> FixedSize for [T; N] {}
 
@@ -61,7 +60,6 @@ mod tests {
     #[test]
     fn size() {
         assert_eq!(<()>::SIZE, 0);
-        assert_eq!(<(u8,)>::SIZE, 1);
         assert_eq!(u8::SIZE, 1);
         assert_eq!(<[u16; 21]>::SIZE, 42);
         assert_eq!(<[u8; 1234]>::SIZE, 1234);