Skip to content

Commit a81931c

Browse files
author
Artem Kryvokrysenko
committed
Optimize size of heapless::Vec<_, 0> to 0 bytes
If `Vec` has 0 capacity, it can store only 0 elements, so its len can be assumed to be always 0. I'm updating `DefaultLenType` to have a special case: `DefaultLenType<0>` will be represented by zero sized type which always has value 0. This allows reducing size of `heapless::Vec<u8, 0>` from 8 bytes to 0 bytes.
1 parent 3a9412d commit a81931c

File tree

5 files changed

+191
-13
lines changed

5 files changed

+191
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
5454
- Added the `index_map` module.
5555
- Migrated `Idx` generic for `SortedLinkedList` to use the new `LenType` trait, allowing for `Idx` inference.
5656
- Added similar `LenT` generic to `String`.
57+
- Optimize size of zero capacity `Vec<T, 0>` to be 0 bytes
5758

5859
### Changed
5960

src/len_type.rs

Lines changed: 153 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ pub trait Sealed:
2121
/// The zero value of the integer type.
2222
const ZERO: Self;
2323
/// The one value of the integer type.
24-
const ONE: Self;
25-
/// The maximum value of this type.
2624
const MAX: Self;
2725
/// The maximum value of this type, as a `usize`.
2826
const MAX_USIZE: usize;
2927

28+
/// The one value of the integer type.
29+
///
30+
/// It's a function instead of constant because we want to have implementation which panics for
31+
/// type `ZeroLenType`
32+
fn one() -> Self;
33+
3034
/// An infallible conversion from `usize` to `LenT`.
3135
#[inline]
3236
fn from_usize(val: usize) -> Self {
@@ -55,9 +59,12 @@ macro_rules! impl_lentype {
5559
$(#[$meta])*
5660
impl Sealed for $LenT {
5761
const ZERO: Self = 0;
58-
const ONE: Self = 1;
5962
const MAX: Self = Self::MAX;
6063
const MAX_USIZE: usize = Self::MAX as _;
64+
65+
fn one() -> Self {
66+
1
67+
}
6168
}
6269

6370
$(#[$meta])*
@@ -111,11 +118,153 @@ pub trait SmallestLenType {
111118
#[allow(rustdoc::private_intra_doc_links)] // Only publically exposed via `crate::_export`
112119
pub type DefaultLenType<const N: usize> = <Const<N> as SmallestLenType>::Type;
113120

114-
impl_lentodefault!(u8: 0, 1, 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, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255);
121+
impl_lentodefault!(ZeroLenType: 0);
122+
impl_lentodefault!(u8: 1, 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, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255);
115123
impl_lentodefault!(u16: 256, 300, 400, 500, 512, 600, 700, 800, 900, 1000, 1024, 2000, 2048, 4000, 4096, 8000, 8192, 16000, 16384, 32000, 32768, 65000, 65535);
116124
#[cfg(any(target_pointer_width = "32", target_pointer_width = "64"))]
117125
impl_lentodefault!(u32: 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648);
118126

119127
pub const fn check_capacity_fits<LenT: LenType, const N: usize>() {
120128
assert!(LenT::MAX_USIZE >= N, "The capacity is larger than `LenT` can hold, increase the size of `LenT` or reduce the capacity");
121129
}
130+
131+
/// Container with 0 capacity always has length 0, so there is no need to track length of such containers at all.
132+
///
133+
/// This type is used as a placeholder for length of container with 0 capacity. It allows optimizing total size of
134+
/// containers like this to 0 bytes.
135+
///
136+
/// Logically, this type always stores value 0. Because of this ZeroLenType::one() panics and should never be called.
137+
#[doc(hidden)]
138+
#[derive(Copy, Clone, PartialEq, PartialOrd)]
139+
pub struct ZeroLenType;
140+
141+
impl Debug for ZeroLenType {
142+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
143+
write!(f, "0")
144+
}
145+
}
146+
147+
impl Display for ZeroLenType {
148+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
149+
write!(f, "0")
150+
}
151+
}
152+
153+
impl Sealed for ZeroLenType {
154+
const ZERO: Self = Self;
155+
156+
const MAX: Self = Self;
157+
const MAX_USIZE: usize = 0;
158+
159+
#[inline]
160+
fn one() -> Self {
161+
panic!("ZeroLenType cannot represent value 1");
162+
}
163+
}
164+
165+
impl LenType for ZeroLenType {}
166+
167+
impl Add for ZeroLenType {
168+
type Output = Self;
169+
170+
fn add(self, _rhs: Self) -> Self::Output {
171+
Self::ZERO
172+
}
173+
}
174+
175+
impl AddAssign for ZeroLenType {
176+
fn add_assign(&mut self, _rhs: Self) {}
177+
}
178+
179+
impl Sub for ZeroLenType {
180+
type Output = Self;
181+
182+
fn sub(self, _rhs: Self) -> Self::Output {
183+
Self::ZERO
184+
}
185+
}
186+
187+
impl SubAssign for ZeroLenType {
188+
fn sub_assign(&mut self, _rhs: Self) {}
189+
}
190+
191+
#[doc(hidden)]
192+
#[derive(Debug, PartialEq)]
193+
pub struct ZeroLenTypeTryFromError;
194+
195+
impl TryFrom<usize> for ZeroLenType {
196+
type Error = ZeroLenTypeTryFromError;
197+
198+
fn try_from(value: usize) -> Result<Self, Self::Error> {
199+
if value > 0 {
200+
return Err(ZeroLenTypeTryFromError);
201+
}
202+
203+
Ok(Self::ZERO)
204+
}
205+
}
206+
207+
impl TryInto<usize> for ZeroLenType {
208+
type Error = ();
209+
210+
fn try_into(self) -> Result<usize, Self::Error> {
211+
Ok(0)
212+
}
213+
}
214+
215+
#[cfg(test)]
216+
mod tests {
217+
use crate::len_type::{Sealed, ZeroLenType, ZeroLenTypeTryFromError};
218+
219+
#[test]
220+
pub fn test_zero_len_type_conversions() {
221+
assert_eq!(ZeroLenType::into_usize(ZeroLenType::ZERO), 0_usize);
222+
assert_eq!(ZeroLenType::from_usize(0_usize), ZeroLenType::ZERO);
223+
224+
assert_eq!(ZeroLenType::ZERO.try_into(), Ok(0_usize));
225+
assert_eq!(ZeroLenType::try_from(0_usize), Ok(ZeroLenType::ZERO));
226+
assert_eq!(ZeroLenType::try_from(1_usize), Err(ZeroLenTypeTryFromError));
227+
}
228+
229+
#[test]
230+
#[should_panic]
231+
pub fn test_zero_len_type_one() {
232+
ZeroLenType::one();
233+
}
234+
235+
#[test]
236+
#[should_panic]
237+
pub fn test_zero_len_type_one_usize() {
238+
ZeroLenType::from_usize(1);
239+
}
240+
241+
#[test]
242+
pub fn test_zero_len_type_constants() {
243+
assert_eq!(ZeroLenType::ZERO, ZeroLenType);
244+
assert_eq!(ZeroLenType::MAX, ZeroLenType);
245+
assert_eq!(ZeroLenType::MAX_USIZE, 0_usize);
246+
}
247+
248+
#[test]
249+
pub fn test_zero_len_type_size() {
250+
assert_eq!(core::mem::size_of::<ZeroLenType>(), 0);
251+
}
252+
253+
#[test]
254+
pub fn test_zero_len_type_ops() {
255+
assert_eq!(ZeroLenType::ZERO + ZeroLenType::ZERO, ZeroLenType::ZERO);
256+
assert_eq!(ZeroLenType::ZERO - ZeroLenType::ZERO, ZeroLenType::ZERO);
257+
258+
let mut zero = ZeroLenType::ZERO;
259+
zero += ZeroLenType::ZERO;
260+
assert_eq!(zero, ZeroLenType::ZERO);
261+
zero -= ZeroLenType::ZERO;
262+
assert_eq!(zero, ZeroLenType::ZERO);
263+
}
264+
265+
#[test]
266+
pub fn test_zero_len_type_debug() {
267+
assert_eq!(format!("{}", ZeroLenType), "0");
268+
assert_eq!(format!("{:?}", ZeroLenType), "0");
269+
}
270+
}

src/sorted_linked_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ mod tests {
905905

906906
#[test]
907907
fn test_zero_size() {
908-
let ll: SortedLinkedList<u32, Max, 0> = SortedLinkedList::new_u8();
908+
let ll: SortedLinkedList<u32, Max, 0, u8> = SortedLinkedList::new_u8();
909909

910910
assert!(ll.is_empty());
911911
assert!(ll.is_full());

src/string/mod.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,4 +1236,29 @@ mod tests {
12361236
let formatted = format!(2; "123");
12371237
assert_eq!(formatted, Err(core::fmt::Error));
12381238
}
1239+
1240+
#[test]
1241+
fn zero_capacity() {
1242+
let mut s: String<0> = String::new();
1243+
// Validate capacity
1244+
assert_eq!(s.capacity(), 0);
1245+
1246+
// Make sure there is no capacity
1247+
assert!(s.push('a').is_err());
1248+
1249+
// Validate length
1250+
assert_eq!(s.len(), 0);
1251+
1252+
// Validate pop
1253+
assert_eq!(s.pop(), None);
1254+
1255+
// Validate slice
1256+
assert_eq!(s.as_str(), "");
1257+
1258+
// Validate empty
1259+
assert!(s.is_empty());
1260+
1261+
// Size of string with zero capacity should be 0 bytes because of `ZeroLenType` optimization
1262+
assert_eq!(core::mem::size_of_val(&s), 0);
1263+
}
12391264
}

src/vec/mod.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ impl<T, LenT: LenType, S: VecStorage<T> + ?Sized> VecInner<T, LenT, S> {
647647
unsafe {
648648
*buf.get_unchecked_mut(len.into_usize()) = MaybeUninit::new(elem.clone());
649649
}
650-
*len += LenT::ONE;
650+
*len += LenT::one();
651651
}
652652
Ok(())
653653
}
@@ -685,7 +685,7 @@ impl<T, LenT: LenType, S: VecStorage<T> + ?Sized> VecInner<T, LenT, S> {
685685
pub unsafe fn pop_unchecked(&mut self) -> T {
686686
debug_assert!(!self.is_empty());
687687

688-
self.len -= LenT::ONE;
688+
self.len -= LenT::one();
689689
self.buffer
690690
.borrow_mut()
691691
.get_unchecked_mut(self.len.into_usize())
@@ -708,7 +708,7 @@ impl<T, LenT: LenType, S: VecStorage<T> + ?Sized> VecInner<T, LenT, S> {
708708
.borrow_mut()
709709
.get_unchecked_mut(self.len.into_usize()) = MaybeUninit::new(item);
710710

711-
self.len += LenT::ONE;
711+
self.len += LenT::one();
712712
}
713713

714714
/// Shortens the vector, keeping the first `len` elements and dropping the rest.
@@ -934,7 +934,7 @@ impl<T, LenT: LenType, S: VecStorage<T> + ?Sized> VecInner<T, LenT, S> {
934934
let value = ptr::read(self.as_ptr().add(index));
935935
let base_ptr = self.as_mut_ptr();
936936
ptr::copy(base_ptr.add(length - 1), base_ptr.add(index), 1);
937-
self.len -= LenT::ONE;
937+
self.len -= LenT::one();
938938
value
939939
}
940940

@@ -1218,8 +1218,8 @@ impl<T, LenT: LenType, S: VecStorage<T> + ?Sized> VecInner<T, LenT, S> {
12181218
let cur = unsafe { &mut *p.add(g.processed_len.into_usize()) };
12191219
if !f(cur) {
12201220
// Advance early to avoid double drop if `drop_in_place` panicked.
1221-
g.processed_len += LenT::ONE;
1222-
g.deleted_cnt += LenT::ONE;
1221+
g.processed_len += LenT::one();
1222+
g.deleted_cnt += LenT::one();
12231223
// SAFETY: We never touch this element again after dropped.
12241224
unsafe { ptr::drop_in_place(cur) };
12251225
// We already advanced the counter.
@@ -1237,7 +1237,7 @@ impl<T, LenT: LenType, S: VecStorage<T> + ?Sized> VecInner<T, LenT, S> {
12371237
ptr::copy_nonoverlapping(cur, hole_slot, 1);
12381238
}
12391239
}
1240-
g.processed_len += LenT::ONE;
1240+
g.processed_len += LenT::one();
12411241
}
12421242
}
12431243

@@ -1462,7 +1462,7 @@ impl<T, LenT: LenType, const N: usize> Iterator for IntoIter<T, N, LenT> {
14621462
.as_ptr()
14631463
.read()
14641464
};
1465-
self.next += LenT::ONE;
1465+
self.next += LenT::one();
14661466
Some(item)
14671467
} else {
14681468
None
@@ -2204,6 +2204,9 @@ mod tests {
22042204

22052205
// Validate full
22062206
assert!(v.is_full());
2207+
2208+
// Size of vector with zero capacity should be 0 bytes because of `ZeroLenType` optimization
2209+
assert_eq!(core::mem::size_of_val(&v), 0);
22072210
}
22082211

22092212
#[test]

0 commit comments

Comments
 (0)