diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-24 03:56:26 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-24 03:57:46 +0900 |
| commit | f1af14b1cc503ac20f56a79a96c7780d02bdfe75 (patch) | |
| tree | 3f8661e1dc4d2092ac16b45c574c90ec2d8bec2a /crates/shirabe/src/command/run_script_command.rs | |
| parent | c5fc34a106a706ac12925c4df273a926811d260b (diff) | |
| download | php-shirabe-f1af14b1cc503ac20f56a79a96c7780d02bdfe75.tar.gz php-shirabe-f1af14b1cc503ac20f56a79a96c7780d02bdfe75.tar.zst php-shirabe-f1af14b1cc503ac20f56a79a96c7780d02bdfe75.zip | |
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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/command/run_script_command.rs')
| -rw-r--r-- | crates/shirabe/src/command/run_script_command.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index 5a8f628..383c5bb 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -41,7 +41,7 @@ impl Default for RunScriptCommand { impl RunScriptCommand { pub fn new() -> Self { - let mut command = RunScriptCommand { + let command = RunScriptCommand { base_command_data: BaseCommandData::new(None), script_events: vec![ ScriptEvents::PRE_INSTALL_CMD, @@ -64,7 +64,7 @@ impl RunScriptCommand { command } - fn list_scripts(&mut self, output: Rc<RefCell<dyn OutputInterface>>) -> Result<i64> { + fn list_scripts(&self, output: Rc<RefCell<dyn OutputInterface>>) -> Result<i64> { let scripts = self.get_scripts()?; if scripts.is_empty() { return Ok(0); @@ -87,7 +87,7 @@ impl RunScriptCommand { Ok(0) } - fn get_scripts(&mut self) -> Result<Vec<(String, String)>> { + fn get_scripts(&self) -> Result<Vec<(String, String)>> { let composer = self.require_composer(None, None)?; let scripts = crate::command::composer_full(&composer) .get_package() @@ -116,7 +116,7 @@ impl RunScriptCommand { } impl Command for RunScriptCommand { - fn configure(&mut self) -> anyhow::Result<()> { + fn configure(&self) -> anyhow::Result<()> { self.set_name("run-script")?; self.set_aliases(vec!["run".to_string()])?; self.set_description("Runs the scripts defined in composer.json"); @@ -184,7 +184,7 @@ impl Command for RunScriptCommand { } fn interact( - &mut self, + &self, input: Rc<RefCell<dyn InputInterface>>, _output: Rc<RefCell<dyn OutputInterface>>, ) { @@ -226,7 +226,7 @@ impl Command for RunScriptCommand { } fn execute( - &mut self, + &self, input: Rc<RefCell<dyn InputInterface>>, output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { @@ -326,7 +326,7 @@ impl Command for RunScriptCommand { } fn initialize( - &mut self, + &self, input: Rc<RefCell<dyn InputInterface>>, output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<()> { @@ -337,10 +337,10 @@ impl Command for RunScriptCommand { } impl BaseCommand for RunScriptCommand { - 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); |
