diff --git a/src/completion.rs b/src/completion.rs
index 0c2c797b4..76dfb8f33 100644
--- a/src/completion.rs
+++ b/src/completion.rs
@@ -175,7 +175,7 @@ cfg_if::cfg_if! {
 }
 
 /// Kind of quote.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Quote {
     /// Double quote: `"`
     Double,
@@ -473,7 +473,7 @@ pub fn longest_common_prefix<C: Candidate>(candidates: &[C]) -> Option<&str> {
     Some(&candidate[0..longest_common_prefix])
 }
 
-#[derive(PartialEq)]
+#[derive(Eq, PartialEq)]
 enum ScanMode {
     DoubleQuote,
     Escape,
diff --git a/src/keymap.rs b/src/keymap.rs
index 607e6098a..025ea97a7 100644
--- a/src/keymap.rs
+++ b/src/keymap.rs
@@ -12,7 +12,7 @@ use crate::{Event, EventContext, EventHandler};
 pub type RepeatCount = usize;
 
 /// Commands
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 #[non_exhaustive]
 pub enum Cmd {
     /// abort
@@ -215,7 +215,7 @@ const fn repeat_count(previous: RepeatCount, new: Option<RepeatCount>) -> Repeat
 }
 
 /// Different word definitions
-#[derive(Debug, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, Eq, PartialEq, Copy)]
 pub enum Word {
     /// non-blanks characters
     Big,
@@ -226,7 +226,7 @@ pub enum Word {
 }
 
 /// Where to move with respect to word boundary
-#[derive(Debug, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, Eq, PartialEq, Copy)]
 pub enum At {
     /// Start of word.
     Start,
@@ -237,7 +237,7 @@ pub enum At {
 }
 
 /// Where to paste (relative to cursor position)
-#[derive(Debug, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, Eq, PartialEq, Copy)]
 pub enum Anchor {
     /// After cursor
     After,
@@ -246,7 +246,7 @@ pub enum Anchor {
 }
 
 /// character search
-#[derive(Debug, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, Eq, PartialEq, Copy)]
 pub enum CharSearch {
     /// Forward search
     Forward(char),
@@ -270,7 +270,7 @@ impl CharSearch {
 }
 
 /// Where to move
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 #[non_exhaustive]
 pub enum Movement {
     /// Whole current line (not really a movement but a range)
@@ -332,7 +332,7 @@ impl Movement {
 }
 
 /// Vi input modes
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, Eq, PartialEq)]
 pub enum InputMode {
     /// Vi Command/Alternate
     Command,
diff --git a/src/tty/windows.rs b/src/tty/windows.rs
index c5a237df2..657aef419 100644
--- a/src/tty/windows.rs
+++ b/src/tty/windows.rs
@@ -75,10 +75,10 @@ type ConsoleKeyMap = ();
 #[cfg(not(test))]
 pub type KeyMap = ConsoleKeyMap;
 
-#[must_use = "You must restore default mode (disable_raw_mode)"]
 #[cfg(not(test))]
 pub type Mode = ConsoleMode;
 
+#[must_use = "You must restore default mode (disable_raw_mode)"]
 #[derive(Clone, Debug)]
 pub struct ConsoleMode {
     original_conin_mode: DWORD,