chore: additional clippy fixes (#661)

Author: reubeno

.github/workflows/ci.yaml

@@ -336,7 +336,7 @@ jobs:
 
       - name: Clippy check
         if: matrix.rust-version == 'stable'
-        run: cargo clippy --all-features --all-targets
+        run: cargo clippy --workspace --all-features --all-targets
 
   # Check for unneeded dependencies.
   check-deps:

brush-core/src/builtins/exit.rs

@@ -14,14 +14,12 @@ impl builtins::Command for ExitCommand {
         &self,
         context: commands::ExecutionContext<'_>,
     ) -> Result<crate::builtins::ExitCode, crate::error::Error> {
-        let code_8bit: u8;
-
         #[expect(clippy::cast_sign_loss)]
-        if let Some(code_32bit) = &self.code {
-            code_8bit = (code_32bit & 0xFF) as u8;
+        let code_8bit = if let Some(code_32bit) = &self.code {
+            (code_32bit & 0xFF) as u8
         } else {
-            code_8bit = context.shell.last_exit_status;
-        }
+            context.shell.last_exit_status
+        };
 
         Ok(builtins::ExitCode::ExitShell(code_8bit))
     }

brush-core/src/builtins/return_.rs

@@ -15,13 +15,12 @@ impl builtins::Command for ReturnCommand {
         &self,
         context: commands::ExecutionContext<'_>,
     ) -> Result<crate::builtins::ExitCode, crate::error::Error> {
-        let code_8bit: u8;
         #[expect(clippy::cast_sign_loss)]
-        if let Some(code_32bit) = &self.code {
-            code_8bit = (code_32bit & 0xFF) as u8;
+        let code_8bit = if let Some(code_32bit) = &self.code {
+            (code_32bit & 0xFF) as u8
         } else {
-            code_8bit = context.shell.last_exit_status;
-        }
+            context.shell.last_exit_status
+        };
 
         if context.shell.in_function() || context.shell.in_sourced_script() {
             Ok(builtins::ExitCode::ReturnFromFunctionOrScript(code_8bit))

brush-core/src/builtins/set.rs

@@ -186,6 +186,7 @@ impl builtins::Command for SetCommand {
     }
 
     #[expect(clippy::too_many_lines)]
+    #[allow(clippy::useless_let_if_seq)]
     async fn execute(
         &self,
         context: commands::ExecutionContext<'_>,

brush-core/src/completion.rs

@@ -395,7 +395,7 @@ impl Spec {
                 CompleteAction::Alias => {
                     for name in shell.aliases.keys() {
                         if name.starts_with(token) {
-                            candidates.insert(name.to_string());
+                            candidates.insert(name.clone());
                         }
                     }
                 }

brush-core/src/shell.rs

@@ -540,7 +540,7 @@ impl Shell {
                 shell
                     .history
                     .as_ref()
-                    .map_or("0".into(), |h| h.count().to_string().into())
+                    .map_or_else(|| "0".into(), |h| h.count().to_string().into())
             },
             setter: |_| (),
         });

brush-core/src/variables.rs

@@ -430,7 +430,7 @@ impl ShellVariable {
                         new_value.push_str(value.as_str());
                     }
 
-                    arr.insert(array_index, new_value.to_string());
+                    arr.insert(array_index, new_value.clone());
                 } else {
                     arr.insert(array_index, value);
                 }

brush-parser/src/error.rs

@@ -23,6 +23,7 @@ pub enum ParseError {
 }
 
 #[cfg(feature = "diagnostics")]
+#[allow(clippy::cast_sign_loss)]
 pub mod miette {
     use super::ParseError;
     use miette::SourceOffset;
@@ -32,15 +33,15 @@ pub mod miette {
         pub fn to_pretty_error(self, input: impl Into<String>) -> PrettyError {
             let input = input.into();
             let location = match self {
-                ParseError::ParsingNearToken(ref token) => Some(SourceOffset::from_location(
+                Self::ParsingNearToken(ref token) => Some(SourceOffset::from_location(
                     &input,
                     token.location().start.line as usize,
                     token.location().start.column as usize,
                 )),
-                ParseError::Tokenizing { ref position, .. } => position.as_ref().map(|p| {
+                Self::Tokenizing { ref position, .. } => position.as_ref().map(|p| {
                     SourceOffset::from_location(&input, p.line as usize, p.column as usize)
                 }),
-                ParseError::ParsingAtEndOfInput => {
+                Self::ParsingAtEndOfInput => {
                     Some(SourceOffset::from_location(&input, usize::MAX, usize::MAX))
                 }
             };

xtask/src/main.rs

@@ -31,15 +31,15 @@ enum DocsCommand {
 
 #[derive(Parser)]
 enum CompletionCommand {
-    /// Generate completion script for bash.
+    /// Generate completion script for `bash`.
     Bash,
-    /// Generate completion script for elvish.
+    /// Generate completion script for `elvish`.
     Elvish,
-    /// Generate completion script for fish.
+    /// Generate completion script for `fish`.
     Fish,
-    /// Generate completion script for PowerShell.
+    /// Generate completion script for `PowerShell`.
     PowerShell,
-    /// Generate completion script for zsh.
+    /// Generate completion script for `zsh`.
     Zsh,
 }