refactor(term): count keymap capacity

ymgyt · May 4, 2024 · 466368f · 466368f
1 parent 55d3764
commit 466368f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/crates/synd_term/src/keymap/macros.rs b/crates/synd_term/src/keymap/macros.rs
@@ -1,4 +1,6 @@
 macro_rules! keymap {
+    ( @count $token:tt ) => { () };
+
     ( @trie $cmd:ident ) =>  { $crate::keymap::KeyTrie::Command($crate::command::Command::$cmd()) };
 
     (@trie
@@ -11,11 +13,15 @@ macro_rules! keymap {
         { $( $($key:literal)|+ => $value:tt, )+ }
     ) => {
         {
-            // TODO: calcu cap
-            let mut map = ::std::collections::HashMap::new();
+            // https://danielkeep.github.io/tlborm/book/blk-counting.html#slice-length
+            let capacity = <[()]>::len(&[
+                 $(
+                     $( keymap!(@count $key) ),*
+                ),*
+            ]);
+            let mut map = ::std::collections::HashMap::with_capacity(capacity);
             $(
                 $(
-                    // TODO: parse KeyEvent from literal
                     let key_event = $crate::keymap::parse($key).unwrap();
                     let trie = keymap!(@trie $value );
                     map.insert(key_event, trie);

diff --git a/crates/synd_term/tests/integration.rs b/crates/synd_term/tests/integration.rs
@@ -22,7 +22,6 @@ mod test {
     #[tokio::test(flavor = "multi_thread")]
     #[file_serial(a)]
     async fn hello_world() -> anyhow::Result<()> {
-        // TODO: wrap once
         tracing_subscriber::fmt()
             .with_env_filter(EnvFilter::from_default_env())
             .with_line_number(true)