fix: issues due to rebasing

Author: AMythicDev

src/core/commands.rs

@@ -124,12 +124,6 @@ impl Debug for Command {
             Self::AddInputBinding(et, _) => write!(f, "AddInputBinding({et:?})"),
             Self::RemoveInputBinding(et) => write!(f, "RemoveInputBinding({et:?})"),
             Self::FollowOutput(follow_output) => write!(f, "FollowOutput({follow_output:?})"),
-            Self::AddKeyBinding(desc, _, remap) => write!(f, "AddKeyBinding({desc:?}, {remap})"),
-            Self::AddMouseBinding(desc, _, remap) => {
-                write!(f, "AddMouseBinding({desc:?}, {remap})")
-            }
-            Self::RemoveKeyBinding(desc) => write!(f, "RemoveKeyBinding({desc:?})"),
-            Self::RemoveMouseBinding(desc) => write!(f, "RemoveMouseBinding({desc:?})"),
             Self::Io(c) => write!(f, "Io({c:?})"),
         }
     }

src/input/definitions/keydefs.rs

@@ -60,6 +60,7 @@ impl Default for KeySeq {
 /// # Panics
 /// This function will panic if the description is not valid. See the [`input`](crate::input) module
 /// docs on how to write descriptions.
+#[must_use]
 pub fn parse_key_event(text: &str) -> KeyEvent {
     let token_list = super::parse_tokens(text);
 

src/input/definitions/mousedefs.rs

@@ -30,6 +30,7 @@ static MOUSE_ACTIONS: LazyLock<HashMap<&str, MouseEventKind>> = LazyLock::new(||
 /// # Panics
 /// This function will panic if the description is not valid. See the [`input`](crate::input) module
 /// docs on how to write descriptions.
+#[must_use]
 pub fn parse_mouse_event(text: &str) -> MouseEvent {
     let token_list = super::parse_tokens(text);
     gen_mouse_event_from_tokenlist(&token_list, text)

src/input/hashed_event_register.rs

@@ -90,7 +90,7 @@ impl Hash for EventWrapper {
 pub struct HashedEventRegister(HashMap<EventWrapper, EventReturnType, RandomState>);
 
 impl Default for HashedEventRegister {
-    /// Create a new [HashedEventRegister] with the default hasher and insert the default bindings
+    /// Create a new [`HashedEventRegister`] with the default hasher and insert the default bindings
     fn default() -> Self {
         let mut event_register = Self::new();
         super::generate_default_bindings(&mut event_register);
@@ -102,7 +102,7 @@ impl Default for HashedEventRegister {
 // GENERAL FUNCTIONS
 // ####################
 impl HashedEventRegister {
-    /// Create a new HashedEventRegister with the Hasher `s`
+    /// Create a new `HashedEventRegister`
     pub fn new() -> Self {
         Self(HashMap::new())
     }

src/input/mod.rs

@@ -218,13 +218,13 @@ pub(crate) fn generate_default_bindings(map: &mut HashedEventRegister) {
     map.map_mouse(&["scroll:down"], |_, ps| {
         InputEvent::UpdateUpperMark(ps.upper_mark.saturating_add(5))
     });
-    map.add_mouse_events(&["left:down"], |ev, _| {
+    map.map_mouse(&["left:down"], |ev, _| {
         let Event::Mouse(MouseEvent { column, row, .. }) = ev else {
             unreachable!();
         };
         InputEvent::StartSelection { x: column, y: row }
     });
-    map.add_mouse_events(&["left:drag"], |ev, _| {
+    map.map_mouse(&["left:drag"], |ev, _| {
         let Event::Mouse(MouseEvent { column, row, .. }) = ev else {
             unreachable!();
         };
@@ -233,8 +233,8 @@ pub(crate) fn generate_default_bindings(map: &mut HashedEventRegister) {
 
     #[cfg(feature = "clipboard")]
     {
-        map.add_mouse_events(&["left:up"], |_, _| InputEvent::CopySelection);
-        map.add_key_events(&["y"], |_, _| InputEvent::CopySelection);
+        map.map_mouse(&["left:up"], |_, _| InputEvent::CopySelection);
+        map.map_keys(&["y"], |_, _| InputEvent::CopySelection);
     }
 
     map.map_keys(&["c-s-h", "c-h"], |_, ps| {

src/search.rs

@@ -896,16 +896,15 @@ pub(crate) fn nth_match(
         (_, SearchMode::Unknown) => unreachable!(),
     };
 
-    let mut start_idx = nearest_idx.unwrap_or(0) as isize;
-    let match_pos = if jump == 0 {
-        start_idx as usize
-    } else {
+    let mut start_idx = nearest_idx.unwrap_or(0).cast_signed();
+    if jump > 0 {
         start_idx += jump - 1;
-        start_idx = start_idx % (search_idx.len() as isize);
-        start_idx as usize
-    };
+    } else if jump < 0 {
+        start_idx += jump + 1;
+    }
 
-    Some(match_pos)
+    start_idx %= search_idx.len().cast_signed();
+    Some(start_idx.cast_unsigned())
 }
 
 #[cfg(test)]

src/state.rs

@@ -8,7 +8,7 @@ use crate::{
     LineNumbers,
     error::{MinusError, TermError},
     hooks::{Hook, Hooks},
-    input::{self, HashedEventRegister},
+    input::HashedEventRegister,
     minus_core::{
         self, CommandQueue,
         utils::{