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/prohibits_command.rs | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'crates/shirabe/src/command/prohibits_command.rs') diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs index ddbf02a..f35990a 100644 --- a/crates/shirabe/src/command/prohibits_command.rs +++ b/crates/shirabe/src/command/prohibits_command.rs @@ -24,7 +24,7 @@ use crate::io::IOInterface; pub struct ProhibitsCommand { base_command_data: BaseCommandData, - colors: Vec, + colors: std::cell::RefCell>, } impl Default for ProhibitsCommand { @@ -35,9 +35,9 @@ impl Default for ProhibitsCommand { impl ProhibitsCommand { pub fn new() -> Self { - let mut command = ProhibitsCommand { + let command = ProhibitsCommand { base_command_data: BaseCommandData::new(None), - colors: Vec::new(), + colors: std::cell::RefCell::new(Vec::new()), }; command .configure() @@ -47,17 +47,17 @@ impl ProhibitsCommand { } impl BaseDependencyCommand for ProhibitsCommand { - fn colors(&self) -> &[String] { - &self.colors + fn colors(&self) -> std::cell::Ref<'_, Vec> { + self.colors.borrow() } - fn colors_mut(&mut self) -> &mut Vec { - &mut self.colors + fn set_colors(&self, colors: Vec) { + *self.colors.borrow_mut() = colors; } } impl Command for ProhibitsCommand { - fn configure(&mut self) -> anyhow::Result<()> { + fn configure(&self) -> anyhow::Result<()> { // TODO(cli-completion): suggest_available_package() for `package` argument self.set_name("prohibits")?; self.set_aliases(vec!["why-not".to_string()])?; @@ -116,7 +116,7 @@ impl Command for ProhibitsCommand { } fn execute( - &mut self, + &self, input: Rc>, output: Rc>, ) -> anyhow::Result { @@ -124,7 +124,7 @@ impl Command for ProhibitsCommand { } fn initialize( - &mut self, + &self, input: Rc>, output: Rc>, ) -> anyhow::Result<()> { @@ -135,10 +135,10 @@ impl Command for ProhibitsCommand { } impl BaseCommand for ProhibitsCommand { - 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