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/home_command.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'crates/shirabe/src/command/home_command.rs') diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index 5b05815..b3bb3ff 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -43,7 +43,7 @@ impl Default for HomeCommand { impl HomeCommand { pub fn new() -> Self { - let mut command = HomeCommand { + let command = HomeCommand { base_command_data: BaseCommandData::new(None), }; command @@ -53,7 +53,7 @@ impl HomeCommand { } fn handle_package( - &mut self, + &self, package: CompletePackageInterfaceHandle, show_homepage: bool, show_only: bool, @@ -86,7 +86,7 @@ impl HomeCommand { true } - fn open_browser(&mut self, url: &str) { + fn open_browser(&self, url: &str) { let mut process = ProcessExecutor::new(Some(self.get_io().clone())); if Platform::is_windows() { let _ = process.execute( @@ -116,7 +116,7 @@ impl HomeCommand { } } - fn initialize_repos(&mut self) -> Result> { + fn initialize_repos(&self) -> Result> { let composer = self.try_composer(None, None); if let Some(composer) = composer { @@ -142,7 +142,7 @@ impl HomeCommand { } impl Command for HomeCommand { - fn configure(&mut self) -> anyhow::Result<()> { + fn configure(&self) -> anyhow::Result<()> { // TODO(cli-completion): suggest_installed_package() for `packages` argument self.set_name("browse")?; self.set_aliases(vec!["home".to_string()])?; @@ -186,7 +186,7 @@ impl Command for HomeCommand { } fn execute( - &mut self, + &self, input: Rc>, _output: Rc>, ) -> anyhow::Result { @@ -264,7 +264,7 @@ impl Command for HomeCommand { } fn initialize( - &mut self, + &self, input: Rc>, output: Rc>, ) -> anyhow::Result<()> { @@ -275,10 +275,10 @@ impl Command for HomeCommand { } impl BaseCommand for HomeCommand { - 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