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/console/application.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/console/application.rs') diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 1a661df..7f22a65 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -1263,7 +1263,7 @@ impl Application { // PHP: sprintf('%s', OutputFormatter::escape(sprintf($synopsis, $this->getName()))) // A command synopsis carries no printf conversion specifier, so the inner sprintf is an // identity over the synopsis and the application-name argument is never substituted. - let synopsis = running_command.borrow_mut().get_synopsis(false); + let synopsis = running_command.borrow().get_synopsis(false); output.borrow().writeln( &[format!( "{}", @@ -1868,12 +1868,12 @@ impl ApplicationHandle { command: std::rc::Rc>, ) -> anyhow::Result>>> { let application = &self.0; - command.borrow_mut().set_application(Some( + command.borrow().set_application(Some( application.clone() as std::rc::Rc> )); if !command.borrow().is_enabled() { - command.borrow_mut().set_application(None); + command.borrow().set_application(None); return Ok(None); } @@ -2903,7 +2903,7 @@ impl ApplicationHandle { } command - .borrow_mut() + .borrow() .run(input.clone(), output.clone()) .map(|c| c as i32) } -- cgit v1.3.1