From 8bb66c567643c83c4f666a781710a0ac26d7e370 Mon Sep 17 00:00:00 2001
From: Lokathor <zefria@gmail.com>
Date: Sun, 26 Jan 2020 14:20:40 -0700
Subject: [PATCH] Update tinyvec.rs

---
 src/tinyvec.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/tinyvec.rs b/src/tinyvec.rs
index a6c223f..8efd13d 100644
--- a/src/tinyvec.rs
+++ b/src/tinyvec.rs
@@ -31,9 +31,23 @@ macro_rules! tiny_vec {
   };
   ($array_type:ty, $($elem:expr),*) => {
     {
-      let mut tv: TinyVec<$array_type> = Default::default();
-      $( tv.push($elem); )*
-      tv
+      // Note(Lokathor): This goofy looking thing will count the number of
+      // `$elem` entries we were given. We can't spit out the "+1"s on their
+      // own, we need to use `$elem` in the repetition-expansion somehow.
+      // However, we also can't assume it's `Copy` data, so we must use `$elem`
+      // only once "for real" in the expansion as a whole. To achieve this, we
+      // can `stringify!` each element in an inner block, then have the block
+      // return a 1. The stringification is a compile time thing, it won't
+      // actually move any values.
+      const INVOKED_ELEM_COUNT: usize = 0 $( + { let _ = stringify!($elem); 1 })*;
+      // If we have more `$elem` than the `CAPACITY` we will simply go directly
+      // to constructing on the heap.
+      let av: TinyVec<$array_type> = if INVOKED_ELEM_COUNT <= <$array_type as Array>::CAPACITY {
+        TinyVec::<$array_type>::Inline(array_vec!($array_type, $($elem),*))
+      } else {
+        TinyVec::<$array_type>::Heap(vec!($($elem),*))
+      };
+      av
     }
   };
 }