Merge pull request #132 from sachaos/use-stable-only

Remove intersperse

.github/workflows/cd.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable
 
           target: ${{ matrix.target }}
 
@@ -78,7 +78,7 @@ jobs:
 
           use-cross: ${{ matrix.use-cross }}
 
-          toolchain: nightly
+          toolchain: stable
 
           args: --release --target ${{ matrix.target }}
 

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - name: Run tests
         run: cargo test --all-features --workspace
@@ -27,7 +27,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
       - uses: Swatinem/rust-cache@v2
@@ -55,7 +55,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - name: Check documentation
         env:

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "stable"

src/components/help.rs

@@ -30,19 +30,21 @@ fn keys_str(
 ) -> Vec<Span> {
     keybindings.get(&(mode, action.clone())).map_or_else(
         || vec![Span::from("None")],
-        |keys| {
-            keys.iter()
-                .map(|keys| {
-                    let mut s = String::new();
-                    for key in keys {
-                        s.push('<');
-                        s.push_str(&display_key(key));
-                        s.push('>');
-                    }
-                    Span::styled(s, Style::default().fg(Color::Yellow))
-                })
-                .intersperse(Span::from(", "))
-                .collect()
+        |keys_list| {
+            let mut spans = Vec::new();
+            for (i, keys) in keys_list.iter().enumerate() {
+                let mut s = String::new();
+                for key in keys {
+                    s.push('<');
+                    s.push_str(&display_key(key));
+                    s.push('>');
+                }
+                spans.push(Span::styled(s, Style::default().fg(Color::Yellow)));
+                if i < keys_list.len() - 1 {
+                    spans.push(Span::from(", "));
+                }
+            }
+            spans
         },
     )
 }
@@ -396,3 +398,33 @@ fn get_action_keys(keybindings: KeyBindings) -> HashMap<(Mode, String), Vec<Vec<
     });
     action_keys
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+    use std::collections::HashMap;
+
+    #[test]
+    fn test_keys_str() {
+        let mut keybindings = HashMap::new();
+        let mode = Mode::All;
+        let action = String::from("action");
+        let key_event1 = KeyEvent::from(KeyCode::Char('a'));
+        let key_event2 = KeyEvent::from(KeyCode::Char('b'));
+        let key_event3 = KeyEvent::from(KeyCode::Char('c'));
+        keybindings.insert(
+            (mode, action.clone()),
+            vec![vec![key_event1], vec![key_event2, key_event3]],
+        );
+
+        let result = keys_str(&keybindings, mode, action);
+
+        let expected_output = vec![
+            Span::styled("<a>", Style::default().fg(Color::Yellow)),
+            Span::from(", "),
+            Span::styled("<b><c>", Style::default().fg(Color::Yellow)),
+        ];
+        assert_eq!(result, expected_output);
+    }
+}

src/main.rs

@@ -1,7 +1,6 @@
 #![allow(dead_code)]
 #![allow(unused_imports)]
 #![allow(unused_variables)]
-#![feature(iter_intersperse)]
 
 pub mod action;
 pub mod app;