Fix constant assertions

CHANGELOG.md

@@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Fixed a `dropping_references` warning in `LinearMap`.
 - Fixed IndexMap entry API returning wrong slot after an insert on vacant entry. (#360)
+- Fixed constant asserts not asserting at compile time.
 
 ### Removed
 

src/deque.rs

@@ -53,6 +53,11 @@ pub struct Deque<T, const N: usize> {
 
 impl<T, const N: usize> Deque<T, N> {
     const INIT: MaybeUninit<T> = MaybeUninit::uninit();
+    /// ```compile_fail
+    /// use heapless::Deque;
+    /// let _: Deque<u8, 0> = Deque::new();
+    /// ```
+    const _ASSERT: () = assert!(N > 0);
 
     /// Constructs a new, empty deque with a fixed capacity of `N`
     ///
@@ -67,10 +72,9 @@ impl<T, const N: usize> Deque<T, N> {
     /// // allocate the deque in a static variable
     /// static mut X: Deque<u8, 16> = Deque::new();
     /// ```
+    #[allow(path_statements)]
     pub const fn new() -> Self {
-        // Const assert N > 0
-        crate::sealed::greater_than_0::<N>();
-
+        Self::_ASSERT;
         Self {
             buffer: [Self::INIT; N],
             front: 0,

src/histbuf.rs

@@ -42,6 +42,11 @@ pub struct HistoryBuffer<T, const N: usize> {
 
 impl<T, const N: usize> HistoryBuffer<T, N> {
     const INIT: MaybeUninit<T> = MaybeUninit::uninit();
+    /// ```compile_failure
+    /// use heapless::HistoryBuffer;
+    /// let _: HistoryBuffer<u8, 0> = HistoryBuffer::new();
+    /// ```
+    const _ASSERT: () = assert!(N > 0);
 
     /// Constructs a new history buffer.
     ///
@@ -57,10 +62,9 @@ impl<T, const N: usize> HistoryBuffer<T, N> {
     /// assert_eq!(x.len(), 0);
     /// ```
     #[inline]
+    #[allow(path_statements)]
     pub const fn new() -> Self {
-        // Const assert
-        crate::sealed::greater_than_0::<N>();
-
+        Self::_ASSERT;
         Self {
             data: [Self::INIT; N],
             write_at: 0,

src/indexmap.rs

@@ -532,11 +532,10 @@ pub struct IndexMap<K, V, S, const N: usize> {
 
 impl<K, V, S, const N: usize> IndexMap<K, V, BuildHasherDefault<S>, N> {
     /// Creates an empty `IndexMap`.
+    #[allow(path_statements)]
     pub const fn new() -> Self {
-        // Const assert
-        crate::sealed::greater_than_1::<N>();
-        crate::sealed::power_of_two::<N>();
-
+        Self::_ASSERT1;
+        Self::_ASSERT2;
         IndexMap {
             build_hasher: BuildHasherDefault::new(),
             core: CoreMap::new(),
@@ -545,6 +544,27 @@ impl<K, V, S, const N: usize> IndexMap<K, V, BuildHasherDefault<S>, N> {
 }
 
 impl<K, V, S, const N: usize> IndexMap<K, V, S, N> {
+    /// ```compile_fail
+    /// use heapless::FnvIndexMap;
+    /// let _: FnvIndexMap<u8, u8, 0> = FnvIndexMap::new();
+    /// ```
+    ///
+    /// ```compile_fail
+    /// use heapless::FnvIndexMap;
+    /// let _: FnvIndexMap<u8, u8, 0> = FnvIndexMap::default();
+    /// ```
+    const _ASSERT1: () = assert!(N > 1);
+    /// ```compile_fail
+    /// use heapless::FnvIndexMap;
+    /// let _: FnvIndexMap<u8, u8, 3> = FnvIndexMap::new();
+    /// ```
+    ///
+    /// ```compile_fail
+    /// use heapless::FnvIndexMap;
+    /// let _: FnvIndexMap<u8, u8, 3> = FnvIndexMap::default();
+    /// ```
+    const _ASSERT2: () = assert!(N.is_power_of_two());
+
     /// Returns the number of elements the map can hold
     pub fn capacity(&self) -> usize {
         N
@@ -1020,11 +1040,10 @@ impl<K, V, S, const N: usize> Default for IndexMap<K, V, S, N>
 where
     S: Default,
 {
+    #[allow(path_statements)]
     fn default() -> Self {
-        // Const assert
-        crate::sealed::greater_than_1::<N>();
-        crate::sealed::power_of_two::<N>();
-
+        Self::_ASSERT1;
+        Self::_ASSERT2;
         IndexMap {
             build_hasher: <_>::default(),
             core: CoreMap::new(),

src/lib.rs

@@ -134,5 +134,3 @@ pub mod spsc;
 
 #[cfg(feature = "ufmt")]
 mod ufmt;
-
-mod sealed;

src/mpmc.rs

@@ -138,14 +138,24 @@ impl<T, const N: usize> MpMcQueue<T, N> {
 
     const ASSERT: [(); 1] = [()];
 
+    /// ```compile_fail
+    /// use heapless::mpmc::MpMcQueue;
+    /// let q: MpMcQueue<i32, 1> = MpMcQueue::new();
+    /// ```
+    const _ASSERT1: () = assert!(N > 1);
+    /// ```compile_fail
+    /// use heapless::mpmc::MpMcQueue;
+    /// let q: MpMcQueue<i32, 3> = MpMcQueue::new();
+    /// ```
+    const _ASSERT2: () = assert!(N.is_power_of_two());
+
     /// Creates an empty queue
+    #[allow(path_statements)]
     pub const fn new() -> Self {
-        // Const assert
-        crate::sealed::greater_than_1::<N>();
-        crate::sealed::power_of_two::<N>();
-
         // Const assert on size.
         Self::ASSERT[!(N < (IntSize::MAX as usize)) as usize];
+        Self::_ASSERT1;
+        Self::_ASSERT2;
 
         let mut cell_count = 0;
 

src/sorted_linked_list.rs

@@ -147,11 +147,12 @@ macro_rules! impl_index_and_const_new {
                 next: $name::none(),
             };
 
+            const _ASSERT: () = assert!(N < $max_val);
+
             /// Create a new linked list.
+            #[allow(path_statements)]
             pub const fn $new_name() -> Self {
-                // Const assert N < MAX
-                crate::sealed::smaller_than::<N, $max_val>();
-
+                Self::_ASSERT;
                 let mut list = SortedLinkedList {
                     list: [Self::UNINIT; N],
                     head: $name::none(),

src/spsc.rs

@@ -125,10 +125,16 @@ impl<T, const N: usize> Queue<T, N> {
         (val + 1) % N
     }
 
+    /// ```compile_fail
+    /// use heapless::spsc::Queue;
+    /// let q: Queue<i32, 0> = Queue::new();
+    /// ```
+    const _ASSERT: () = assert!(N > 1);
+
     /// Creates an empty queue with a fixed capacity of `N - 1`
+    #[allow(path_statements)]
     pub const fn new() -> Self {
-        // Const assert N > 1
-        crate::sealed::greater_than_1::<N>();
+        Self::_ASSERT;
 
         Queue {
             head: AtomicUsize::new(0),

src/vec.rs

@@ -58,9 +58,6 @@ impl<T, const N: usize> Vec<T, N> {
     /// ```
     /// `Vec` `const` constructor; wrap the returned value in [`Vec`](../struct.Vec.html)
     pub const fn new() -> Self {
-        // Const assert N >= 0
-        crate::sealed::greater_than_eq_0::<N>();
-
         Self {
             len: 0,
             buffer: Self::INIT,