reubeno · reubeno · Oct 14, 2024 · Oct 10, 2024 · Oct 11, 2024 · Oct 13, 2024
diff --git a/brush-core/src/builtins.rs b/brush-core/src/builtins.rs
@@ -170,7 +170,7 @@ pub type CommandExecuteFunc = fn(
 pub type CommandContentFunc = fn(&str, ContentType) -> Result<String, error::Error>;
 
 /// Trait implemented by built-in shell commands.
-#[async_trait::async_trait]
+
 pub trait Command: Parser {
     /// Instantiates the built-in command with the given arguments.
     ///
@@ -208,10 +208,11 @@ pub trait Command: Parser {
     /// # Arguments
     ///
     /// * `context` - The context in which the command is being executed.
-    async fn execute(
+    // NOTE: we use desugared async here because we need a Send marker
+    fn execute(
         &self,
         context: commands::ExecutionContext<'_>,
-    ) -> Result<ExitCode, error::Error>;
+    ) -> impl std::future::Future<Output = Result<ExitCode, error::Error>> + std::marker::Send;
 
     /// Returns the textual help content associated with the command.
     ///
@@ -236,7 +237,7 @@ pub trait Command: Parser {
 
 /// Trait implemented by built-in shell commands that take specially handled declarations
 /// as arguments.
-#[async_trait::async_trait]
+
 pub trait DeclarationCommand: Command {
     /// Stores the declarations within the command instance.
     ///
@@ -395,8 +396,7 @@ fn brush_help_styles() -> clap::builder::Styles {
 /// # Returns
 ///
 /// * a parsed struct T from [`clap::Parser::parse_from`]
-/// * the remain iterator `args` with `--` and the rest arguments if they present
-///   othervise None
+/// * the remain iterator `args` with `--` and the rest arguments if they present othervise None
 ///
 /// # Examples
 /// ```
@@ -420,8 +420,8 @@ where
     S: Into<std::ffi::OsString> + Clone + PartialEq<&'static str>,
 {
     let mut args = args.into_iter();
-    // the best way to save `--` is to get it out with a side effect while `clap` iterates over the args
-    // this way we can be 100% sure that we have '--' and the remaining args
+    // the best way to save `--` is to get it out with a side effect while `clap` iterates over the
+    // args this way we can be 100% sure that we have '--' and the remaining args
     // and we will iterate only once
     let mut hyphen = None;
     let args_before_hyphen = args.by_ref().take_while(|a| {
@@ -437,7 +437,8 @@ where
 }
 
 /// Similar to [`parse_known`] but with [`clap::Parser::try_parse_from`]
-/// This function is used to parse arguments in builtins such as [`crate::builtins::echo::EchoCommand`]
+/// This function is used to parse arguments in builtins such as
+/// [`crate::builtins::echo::EchoCommand`]
 pub fn try_parse_known<T: Parser>(
     args: impl IntoIterator<Item = String>,
 ) -> Result<(T, Option<impl Iterator<Item = String>>), clap::Error> {

diff --git a/brush-core/src/builtins/alias.rs b/brush-core/src/builtins/alias.rs
@@ -15,7 +15,6 @@ pub(crate) struct AliasCommand {
     aliases: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for AliasCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/bg.rs b/brush-core/src/builtins/bg.rs
@@ -10,7 +10,6 @@ pub(crate) struct BgCommand {
     job_specs: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for BgCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/break_.rs b/brush-core/src/builtins/break_.rs
@@ -10,7 +10,6 @@ pub(crate) struct BreakCommand {
     which_loop: i8,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for BreakCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/brushinfo.rs b/brush-core/src/builtins/brushinfo.rs
@@ -53,7 +53,6 @@ enum CompleteCommand {
     },
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for BrushInfoCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/builtin_.rs b/brush-core/src/builtins/builtin_.rs
@@ -14,7 +14,6 @@ pub(crate) struct BuiltinCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for BuiltinCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/cd.rs b/brush-core/src/builtins/cd.rs
@@ -28,7 +28,6 @@ pub(crate) struct CdCommand {
     target_dir: Option<PathBuf>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for CdCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/colon.rs b/brush-core/src/builtins/colon.rs
@@ -10,7 +10,6 @@ pub(crate) struct ColonCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ColonCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/command.rs b/brush-core/src/builtins/command.rs
@@ -26,7 +26,6 @@ pub(crate) struct CommandCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for CommandCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/complete.rs b/brush-core/src/builtins/complete.rs
@@ -210,7 +210,6 @@ pub(crate) struct CompleteCommand {
     names: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for CompleteCommand {
     async fn execute(
         &self,
@@ -435,7 +434,6 @@ pub(crate) struct CompGenCommand {
     word: Option<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for CompGenCommand {
     async fn execute(
         &self,
@@ -514,7 +512,6 @@ pub(crate) struct CompOptCommand {
     names: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for CompOptCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/continue_.rs b/brush-core/src/builtins/continue_.rs
@@ -10,7 +10,6 @@ pub(crate) struct ContinueCommand {
     which_loop: i8,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ContinueCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/declare.rs b/brush-core/src/builtins/declare.rs
@@ -110,7 +110,6 @@ impl builtins::DeclarationCommand for DeclareCommand {
 }
 
 #[allow(clippy::too_many_lines)]
-#[async_trait::async_trait]
 impl builtins::Command for DeclareCommand {
     fn takes_plus_options() -> bool {
         true

diff --git a/brush-core/src/builtins/dirs.rs b/brush-core/src/builtins/dirs.rs
@@ -25,7 +25,6 @@ pub(crate) struct DirsCommand {
     // TODO: implement +N and -N
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for DirsCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/dot.rs b/brush-core/src/builtins/dot.rs
@@ -15,7 +15,6 @@ pub(crate) struct DotCommand {
     pub script_args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for DotCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/echo.rs b/brush-core/src/builtins/echo.rs
@@ -24,10 +24,9 @@ pub(crate) struct EchoCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for EchoCommand {
-    /// Override the default [builtins::Command::new] function to handle clap's limitation related to `--`.
-    /// See [crate::builtins::parse_known] for more information
+    /// Override the default [`builtins::Command::new`] function to handle clap's limitation related
+    /// to `--`. See [`builtins::parse_known`] for more information
     /// TODO: we can safely remove this after the issue is resolved
     fn new<I>(args: I) -> Result<Self, clap::Error>
     where
@@ -75,6 +74,6 @@ impl builtins::Command for EchoCommand {
         write!(context.stdout(), "{s}")?;
         context.stdout().flush()?;
 
-        return Ok(builtins::ExitCode::Success);
+        Ok(builtins::ExitCode::Success)
     }
 }
diff --git a/brush-core/src/builtins/enable.rs b/brush-core/src/builtins/enable.rs
@@ -37,7 +37,6 @@ pub(crate) struct EnableCommand {
     names: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for EnableCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/eval.rs b/brush-core/src/builtins/eval.rs
@@ -9,7 +9,6 @@ pub(crate) struct EvalCommand {
     pub args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for EvalCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/exec.rs b/brush-core/src/builtins/exec.rs
@@ -23,7 +23,6 @@ pub(crate) struct ExecCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ExecCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/exit.rs b/brush-core/src/builtins/exit.rs
@@ -9,7 +9,6 @@ pub(crate) struct ExitCommand {
     code: Option<i32>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ExitCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/export.rs b/brush-core/src/builtins/export.rs
@@ -37,7 +37,6 @@ impl builtins::DeclarationCommand for ExportCommand {
     }
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ExportCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/false_.rs b/brush-core/src/builtins/false_.rs
@@ -6,7 +6,6 @@ use crate::{builtins, commands};
 #[derive(Parser)]
 pub(crate) struct FalseCommand {}
 
-#[async_trait::async_trait]
 impl builtins::Command for FalseCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/fg.rs b/brush-core/src/builtins/fg.rs
@@ -10,7 +10,6 @@ pub(crate) struct FgCommand {
     job_spec: Option<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for FgCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/getopts.rs b/brush-core/src/builtins/getopts.rs
@@ -18,7 +18,6 @@ pub(crate) struct GetOptsCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for GetOptsCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/help.rs b/brush-core/src/builtins/help.rs
@@ -22,7 +22,6 @@ pub(crate) struct HelpCommand {
     topic_patterns: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for HelpCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/jobs.rs b/brush-core/src/builtins/jobs.rs
@@ -31,7 +31,6 @@ pub(crate) struct JobsCommand {
     job_specs: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for JobsCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/kill.rs b/brush-core/src/builtins/kill.rs
@@ -16,7 +16,6 @@ pub(crate) struct KillCommand {
 
     //
     // TODO: implement -sigspec syntax
-    //
     /// List known signal names.
     #[arg(short = 'l', short_alias = 'L')]
     list_signals: bool,
@@ -25,7 +24,6 @@ pub(crate) struct KillCommand {
     args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for KillCommand {
     async fn execute(
         &self,
@@ -39,7 +37,7 @@ impl builtins::Command for KillCommand {
         }
 
         if self.list_signals {
-            return error::unimp("kill -l");
+            error::unimp("kill -l")
         } else {
             if self.args.len() != 1 {
                 writeln!(context.stderr(), "{}: invalid usage", context.command_name)?;

diff --git a/brush-core/src/builtins/let_.rs b/brush-core/src/builtins/let_.rs
@@ -11,7 +11,6 @@ pub(crate) struct LetCommand {
     exprs: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for LetCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/popd.rs b/brush-core/src/builtins/popd.rs
@@ -11,10 +11,8 @@ pub(crate) struct PopdCommand {
     no_directory_change: bool,
     //
     // TODO: implement +N and -N
-    //
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for PopdCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/printf.rs b/brush-core/src/builtins/printf.rs
@@ -16,7 +16,6 @@ pub(crate) struct PrintfCommand {
     format_and_args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for PrintfCommand {
     async fn execute(
         &self,
@@ -31,7 +30,7 @@ impl builtins::Command for PrintfCommand {
             context.stdout().flush()?;
         }
 
-        return Ok(builtins::ExitCode::Success);
+        Ok(builtins::ExitCode::Success)
     }
 }
 

diff --git a/brush-core/src/builtins/pushd.rs b/brush-core/src/builtins/pushd.rs
@@ -13,10 +13,8 @@ pub(crate) struct PushdCommand {
     dir: String,
     //
     // TODO: implement +N and -N
-    //
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for PushdCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/pwd.rs b/brush-core/src/builtins/pwd.rs
@@ -14,7 +14,6 @@ pub(crate) struct PwdCommand {
     allow_symlinks: bool,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for PwdCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/read.rs b/brush-core/src/builtins/read.rs
@@ -59,7 +59,6 @@ pub(crate) struct ReadCommand {
     variable_names: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ReadCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/return_.rs b/brush-core/src/builtins/return_.rs
@@ -9,7 +9,6 @@ pub(crate) struct ReturnCommand {
     code: Option<i32>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ReturnCommand {
     async fn execute(
         &self,

diff --git a/brush-core/src/builtins/set.rs b/brush-core/src/builtins/set.rs
@@ -130,7 +130,6 @@ pub(crate) struct SetCommand {
     positional_args: Vec<String>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for SetCommand {
     fn takes_plus_options() -> bool {
         true

diff --git a/brush-core/src/builtins/shift.rs b/brush-core/src/builtins/shift.rs
@@ -9,7 +9,6 @@ pub(crate) struct ShiftCommand {
     n: Option<i32>,
 }
 
-#[async_trait::async_trait]
 impl builtins::Command for ShiftCommand {
     async fn execute(
         &self,