[mod] rename tri-state-layer to tri-layer

Author: dariogoetz

src/layout.rs

@@ -91,7 +91,7 @@ pub struct Layout<
     waiting: Option<WaitingState<T, K>>,
     stacked: Stack,
     tap_hold_tracker: TapHoldTracker,
-    tri_state_layers: Vec<TriStateLayer, L>,
+    tri_layers: Vec<TriLayer, L>,
 }
 
 /// An event on the key matrix.
@@ -337,12 +337,12 @@ impl TapHoldTracker {
 }
 
 #[derive(Debug)]
-struct TriStateLayer {
+struct TriLayer {
     activation_layers: (usize, usize),
     target_layer: usize,
 }
 
-impl TriStateLayer {
+impl TriLayer {
     fn apply(&self, last_layer: usize, second_to_last_layer: usize) -> Option<usize> {
         if (last_layer == self.activation_layers.0
             && second_to_last_layer == self.activation_layers.1)
@@ -368,14 +368,14 @@ impl<const C: usize, const R: usize, const L: usize, T: 'static, K: 'static + Co
             waiting: None,
             stacked: ArrayDeque::new(),
             tap_hold_tracker: Default::default(),
-            tri_state_layers: Vec::new(),
+            tri_layers: Vec::new(),
         }
     }
 
-    /// Adds a tri-state layer that becomes active if two given activation layers are activated.
-    pub fn add_tri_state_layer(&mut self, activation_layers: (usize, usize), target_layer: usize) {
-        self.tri_state_layers
-            .push(TriStateLayer {
+    /// Adds a tri-layer that becomes active if two given activation layers are activated.
+    pub fn add_tri_layer(&mut self, activation_layers: (usize, usize), target_layer: usize) {
+        self.tri_layers
+            .push(TriLayer {
                 activation_layers,
                 target_layer,
             })
@@ -561,14 +561,14 @@ impl<const C: usize, const R: usize, const L: usize, T: 'static, K: 'static + Co
         let last_layer = active_layers.next();
         let second_to_last_layer = active_layers.next();
 
-        let tri_state_layer = last_layer
+        let tri_layer = last_layer
             .zip(second_to_last_layer)
             .and_then(|(last, second)| {
-                self.tri_state_layers
+                self.tri_layers
                     .iter()
-                    .find_map(|tri_state_layer| tri_state_layer.apply(last, second))
+                    .find_map(|tri_layer| tri_layer.apply(last, second))
             });
-        tri_state_layer.unwrap_or(last_layer.unwrap_or(self.default_layer))
+        tri_layer.unwrap_or(last_layer.unwrap_or(self.default_layer))
     }
 
     /// Sets the default layer for the layout
@@ -1268,15 +1268,15 @@ mod test {
     }
 
     #[test]
-    fn tri_state_layers() {
+    fn tri_layers() {
         static LAYERS: Layers<3, 1, 4> = [
             [[l(1), k(A), l(2)]],
             [[Trans, k(B), Trans]],
             [[Trans, k(C), Trans]],
             [[Trans, k(D), Trans]],
         ];
         let mut layout = Layout::new(&LAYERS);
-        layout.add_tri_state_layer((1, 2), 3);
+        layout.add_tri_layer((1, 2), 3);
 
         assert_eq!(CustomEvent::NoEvent, layout.tick());
         assert_eq!(0, layout.current_layer());
@@ -1287,7 +1287,7 @@ mod test {
         assert_eq!(CustomEvent::NoEvent, layout.tick());
         assert_eq!(1, layout.current_layer());
         assert_keys(&[], layout.keycodes());
-        // press L2, going to tri-state layer L3
+        // press L2, going to tri-layer L3
         layout.event(Press(0, 2));
         assert_eq!(CustomEvent::NoEvent, layout.tick());
         assert_eq!(3, layout.current_layer());
@@ -1307,7 +1307,7 @@ mod test {
         assert_eq!(CustomEvent::NoEvent, layout.tick());
         assert_eq!(2, layout.current_layer());
         assert_keys(&[], layout.keycodes());
-        // press L1, going to tri-state layer L3
+        // press L1, going to tri-layer L3
         layout.event(Press(0, 0));
         assert_eq!(CustomEvent::NoEvent, layout.tick());
         assert_eq!(3, layout.current_layer());