From f1af14b1cc503ac20f56a79a96c7780d02bdfe75 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 24 Jun 2026 03:56:26 +0900 Subject: fix(console): make Command/BaseCommand methods take &self The Command trait and Composer's BaseCommand took &mut self, so dispatch held a borrow_mut on the command's RefCell for the whole call. A command re-entering itself (e.g. the help command describing itself) then panicked with "RefCell already borrowed". All Command/BaseCommand methods now take &self and the command state is interior-mutable (Cell/RefCell). Shared borrows coexist, so re-entrant describe paths no longer conflict. Getters that returned references now return Ref guards; the descriptor describe_* methods take &dyn Command; mixin accessors return Ref/RefMut. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/command/exec_command.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/command/exec_command.rs') diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index c4a1e94..caa9808 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -34,7 +34,7 @@ impl Default for ExecCommand { impl ExecCommand { pub fn new() -> Self { - let mut command = ExecCommand { + let command = ExecCommand { base_command_data: BaseCommandData::new(None), }; command @@ -43,7 +43,7 @@ impl ExecCommand { command } - fn get_binaries(&mut self, for_display: bool) -> Result> { + fn get_binaries(&self, for_display: bool) -> Result> { let composer = self.require_composer(None, None)?; let composer_ref = crate::command::composer_full_mut(&composer); let bin_dir = composer_ref @@ -81,7 +81,7 @@ impl ExecCommand { } impl Command for ExecCommand { - fn configure(&mut self) -> anyhow::Result<()> { + fn configure(&self) -> anyhow::Result<()> { self.set_name("exec")?; self.set_description("Executes a vendored binary/script"); self.set_definition(&[ @@ -104,7 +104,7 @@ impl Command for ExecCommand { } fn interact( - &mut self, + &self, input: Rc>, _output: Rc>, ) { @@ -146,7 +146,7 @@ impl Command for ExecCommand { } fn execute( - &mut self, + &self, input: Rc>, _output: Rc>, ) -> anyhow::Result { @@ -236,7 +236,7 @@ impl Command for ExecCommand { } fn initialize( - &mut self, + &self, input: Rc>, output: Rc>, ) -> anyhow::Result<()> { @@ -247,10 +247,10 @@ impl Command for ExecCommand { } impl BaseCommand for ExecCommand { - fn command_data_mut( - &mut self, - ) -> &mut shirabe_external_packages::symfony::console::command::command::CommandData { - self.base_command_data.command_data_mut() + fn command_data( + &self, + ) -> &shirabe_external_packages::symfony::console::command::command::CommandData { + self.base_command_data.command_data() } crate::delegate_base_command_trait_impls_to_inner!(base_command_data); -- cgit v1.3.1