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/base_config_command.rs | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'crates/shirabe/src/command/base_config_command.rs') diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs index 4099ea5..fa14197 100644 --- a/crates/shirabe/src/command/base_config_command.rs +++ b/crates/shirabe/src/command/base_config_command.rs @@ -13,16 +13,14 @@ use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, chmod, touch}; pub trait BaseConfigCommand: BaseCommand { - fn config(&self) -> Option<&std::rc::Rc>>; - fn config_mut(&mut self) -> &mut Option>>; - fn config_file(&self) -> Option<&std::rc::Rc>>; - fn set_config_file(&mut self, file: Option>>); - fn config_source(&self) -> Option<&JsonConfigSource>; - fn config_source_mut(&mut self) -> Option<&mut JsonConfigSource>; - fn set_config_source(&mut self, source: Option); + fn config(&self) -> Option>>; + fn set_config(&self, config: Option>>); + fn config_file(&self) -> Option>>; + fn set_config_file(&self, file: Option>>); + fn set_config_source(&self, source: Option); fn initialize( - &mut self, + &self, input: std::rc::Rc>, output: std::rc::Rc>, ) -> anyhow::Result<()> { @@ -40,10 +38,10 @@ pub trait BaseConfigCommand: BaseCommand { } let io = self.get_io(); - *self.config_mut() = Some(std::rc::Rc::new(std::cell::RefCell::new( + self.set_config(Some(std::rc::Rc::new(std::cell::RefCell::new( Factory::create_config(Some(io.clone()), None)?, - ))); - let config_rc = self.config().unwrap().clone(); + )))); + let config_rc = self.config().unwrap(); // When using --global flag, set baseDir to home directory for correct absolute path resolution if input -- cgit v1.3.1