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/archive_command.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/command/archive_command.rs') diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 1a043af..7355d63 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -50,7 +50,7 @@ impl ArchiveCommand { const FORMATS: &'static [&'static str] = &["tar", "tar.gz", "tar.bz2", "zip"]; pub fn new() -> Self { - let mut command = ArchiveCommand { + let command = ArchiveCommand { base_command_data: BaseCommandData::new(None), }; command @@ -61,7 +61,7 @@ impl ArchiveCommand { } impl Command for ArchiveCommand { - fn configure(&mut self) -> anyhow::Result<()> { + fn configure(&self) -> anyhow::Result<()> { // TODO(cli-completion): suggest_available_package(99) for `package` argument self.set_name("archive")?; self.set_description("Creates an archive of this composer package"); @@ -84,7 +84,7 @@ impl Command for ArchiveCommand { } fn execute( - &mut self, + &self, input: Rc>, output: Rc>, ) -> anyhow::Result { @@ -186,7 +186,7 @@ impl Command for ArchiveCommand { } fn initialize( - &mut self, + &self, input: Rc>, output: Rc>, ) -> anyhow::Result<()> { @@ -197,10 +197,10 @@ impl Command for ArchiveCommand { } impl BaseCommand for ArchiveCommand { - 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); @@ -209,7 +209,7 @@ impl BaseCommand for ArchiveCommand { impl ArchiveCommand { #[allow(clippy::too_many_arguments, reason = "to keep PHP signature")] pub fn archive( - &mut self, + &self, io: std::rc::Rc>, config: &std::rc::Rc>, package_name: Option, @@ -289,7 +289,7 @@ impl ArchiveCommand { } pub fn select_package( - &mut self, + &self, io: std::rc::Rc>, package_name: &str, version: Option<&str>, -- cgit v1.3.1