From d5b313f388d424e60ae33ae58c1a65a65b24b8f1 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 18:04:45 +0900 Subject: refactor(command): share Input/OutputInterface via Rc Convert InputInterface and OutputInterface parameters from &dyn/&mut dyn references to Rc> shared ownership across the command, console, and IO layers, matching the Phase C shared-ownership approach already used for IOInterface. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/io/buffer_io.rs | 3 ++- crates/shirabe/src/io/console_io.rs | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'crates/shirabe/src/io') diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index 836fd95..0696c1c 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -44,7 +44,8 @@ impl BufferIO { // Real fix requires unifying the two crate paths. let _ = formatter; let _ = StreamOutput::new(stream, verbosity, Some(decorated)); - let output: Box = todo!("StreamOutput as Box"); + let output: std::rc::Rc> = + todo!("StreamOutput as std::rc::Rc>"); // TODO(phase-b): symfony console helper modules live under both `symfony::console` // and `symfony::component::console`; QuestionHelper::new is not yet provided. diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index 44e5609..edb0a97 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -34,7 +34,7 @@ pub struct ConsoleIO { authentications: indexmap::IndexMap>>, pub(crate) input: Box, - pub(crate) output: Box, + pub(crate) output: std::rc::Rc>, pub(crate) helper_set: HelperSet, pub(crate) last_message: RefCell, pub(crate) last_message_err: RefCell, @@ -68,7 +68,7 @@ impl ConsoleIO { /// @param HelperSet $helperSet The helperSet instance pub fn new( input: Box, - output: Box, + output: std::rc::Rc>, helper_set: HelperSet, ) -> Self { let mut verbosity_map = IndexMap::new(); @@ -99,7 +99,7 @@ impl ConsoleIO { /// @param string[]|string $messages fn do_write(&self, messages: PhpMixed, newline: bool, stderr: bool, verbosity: i64, raw: bool) { let mut sf_verbosity = *self.verbosity_map.get(&verbosity).unwrap_or(&0); - if sf_verbosity > self.output.get_verbosity() { + if sf_verbosity > self.output.borrow().get_verbosity() { return; } @@ -142,8 +142,8 @@ impl ConsoleIO { messages }; - if stderr && let Some(console_output) = self.output.as_console_output_interface() { - console_output.get_error_output().write( + if stderr && let Some(console_output) = self.output.borrow().as_console_output_interface() { + console_output.get_error_output().borrow().write( &Self::to_string_list(&messages).join(if newline { "\n" } else { "" }), newline, sf_verbosity, @@ -157,7 +157,7 @@ impl ConsoleIO { return; } - self.output.write( + self.output.borrow().write( &Self::to_string_list(&messages).join(if newline { "\n" } else { "" }), newline, sf_verbosity, @@ -256,15 +256,15 @@ impl ConsoleIO { } pub fn get_table(&self) -> Table { - Table::new(&*self.output) + Table::new(self.output.clone()) } - fn get_error_output(&self) -> &dyn OutputInterface { - if let Some(console_output) = self.output.as_console_output_interface() { + fn get_error_output(&self) -> std::rc::Rc> { + if let Some(console_output) = self.output.borrow().as_console_output_interface() { return console_output.get_error_output(); } - &*self.output + self.output.clone() } /// Sanitize string to remove control characters @@ -379,19 +379,19 @@ impl IOInterfaceImmutable for ConsoleIO { } fn is_verbose(&self) -> bool { - self.output.is_verbose() + self.output.borrow().is_verbose() } fn is_very_verbose(&self) -> bool { - self.output.is_very_verbose() + self.output.borrow().is_very_verbose() } fn is_debug(&self) -> bool { - self.output.is_debug() + self.output.borrow().is_debug() } fn is_decorated(&self) -> bool { - self.output.is_decorated() + self.output.borrow().is_decorated() } fn write3(&self, message: &str, newline: bool, verbosity: i64) { -- cgit v1.3.1