diff --git a/src/array.rs b/src/array.rs index 4f099a6..3d77b4a 100644 --- a/src/array.rs +++ b/src/array.rs @@ -44,6 +44,20 @@ pub trait ArrayExt : Array { impl ArrayExt for A where A: Array { } +impl Index for () { + #[inline(always)] + fn to_usize(self) -> usize { 0 } + #[inline(always)] + fn from(ix: usize) -> Self { () } +} + +impl Index for bool { + #[inline(always)] + fn to_usize(self) -> usize { self as usize } + #[inline(always)] + fn from(ix: usize) -> Self { ix != 0 } +} + impl Index for u8 { #[inline(always)] fn to_usize(self) -> usize { self as usize } @@ -97,7 +111,10 @@ macro_rules! fix_array_impl_recursive { ); } -fix_array_impl_recursive!(u8, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + +fix_array_impl_recursive!((), 0,); +fix_array_impl_recursive!(bool, 1,); +fix_array_impl_recursive!(u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ); diff --git a/tests/tests.rs b/tests/tests.rs index 3261df3..eaca12c 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -158,6 +158,11 @@ fn test_compact_size() { println!("{}", mem::size_of::()); assert!(mem::size_of::() <= 8); + // 1 enum tag + 1 drop flag + type EmptyArray = ArrayVec<[u8; 0]>; + println!("{}", mem::size_of::()); + assert!(mem::size_of::() <= 2); + // 12 element size + 1 enum tag + 3 padding + 1 len + 1 drop flag + 2 padding type QuadArray = ArrayVec<[u32; 3]>; println!("{}", mem::size_of::());