diff --git a/cli/src/config.rs b/cli/src/config.rs
index 23ae6cb54f..6affc3f19b 100644
--- a/cli/src/config.rs
+++ b/cli/src/config.rs
@@ -323,7 +323,7 @@ pub struct WorkspaceConfig {
     pub types: String,
 }
 
-#[derive(ArgEnum, Parser, Clone, PartialEq, Debug)]
+#[derive(ArgEnum, Parser, Clone, PartialEq, Eq, Debug)]
 pub enum BootstrapMode {
     None,
     Debian,
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 71931bd034..b12b12bb9d 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -1353,7 +1353,7 @@ fn cd_member(cfg_override: &ConfigOverride, program_name: &str) -> Result<()> {
             return Ok(());
         }
     }
-    return Err(anyhow!("{} is not part of the workspace", program_name,));
+    Err(anyhow!("{} is not part of the workspace", program_name,))
 }
 
 pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result<BinVerification> {
@@ -1440,13 +1440,13 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result<
     Ok(BinVerification { state, is_verified })
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub struct BinVerification {
     pub state: BinVerificationState,
     pub is_verified: bool,
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum BinVerificationState {
     Buffer,
     ProgramData {