aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/depends_command.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-24 03:56:26 +0900
committernsfisis <nsfisis@gmail.com>2026-06-24 03:57:46 +0900
commitf1af14b1cc503ac20f56a79a96c7780d02bdfe75 (patch)
tree3f8661e1dc4d2092ac16b45c574c90ec2d8bec2a /crates/shirabe/src/command/depends_command.rs
parentc5fc34a106a706ac12925c4df273a926811d260b (diff)
downloadphp-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/depends_command.rs')
-rw-r--r--crates/shirabe/src/command/depends_command.rs28
1 files changed, 14 insertions, 14 deletions
diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs
index 133f8b2..f7d57db 100644
--- a/crates/shirabe/src/command/depends_command.rs
+++ b/crates/shirabe/src/command/depends_command.rs
@@ -25,7 +25,7 @@ use crate::io::IOInterface;
pub struct DependsCommand {
base_command_data: BaseCommandData,
- colors: Vec<String>,
+ colors: std::cell::RefCell<Vec<String>>,
}
impl Default for DependsCommand {
@@ -36,9 +36,9 @@ impl Default for DependsCommand {
impl DependsCommand {
pub fn new() -> Self {
- let mut command = DependsCommand {
+ let command = DependsCommand {
base_command_data: BaseCommandData::new(None),
- colors: Vec::new(),
+ colors: std::cell::RefCell::new(Vec::new()),
};
command
.configure()
@@ -48,17 +48,17 @@ impl DependsCommand {
}
impl BaseDependencyCommand for DependsCommand {
- fn colors(&self) -> &[String] {
- &self.colors
+ fn colors(&self) -> std::cell::Ref<'_, Vec<String>> {
+ self.colors.borrow()
}
- fn colors_mut(&mut self) -> &mut Vec<String> {
- &mut self.colors
+ fn set_colors(&self, colors: Vec<String>) {
+ *self.colors.borrow_mut() = colors;
}
}
impl Command for DependsCommand {
- fn configure(&mut self) -> anyhow::Result<()> {
+ fn configure(&self) -> anyhow::Result<()> {
// TODO(cli-completion): suggest_installed_package(true, true) for `package` argument
self.set_name("depends")?;
self.set_aliases(vec!["why".to_string()])?;
@@ -109,7 +109,7 @@ impl Command for DependsCommand {
}
fn execute(
- &mut self,
+ &self,
input: Rc<RefCell<dyn InputInterface>>,
output: Rc<RefCell<dyn OutputInterface>>,
) -> anyhow::Result<i64> {
@@ -117,7 +117,7 @@ impl Command for DependsCommand {
}
fn initialize(
- &mut self,
+ &self,
input: Rc<RefCell<dyn InputInterface>>,
output: Rc<RefCell<dyn OutputInterface>>,
) -> anyhow::Result<()> {
@@ -128,10 +128,10 @@ impl Command for DependsCommand {
}
impl BaseCommand for DependsCommand {
- 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);