refactor(symfony): hide leaf modules behind their parent re-exports

Every parent module in the symfony-* crates already re-exported its leaf
modules with `pub use`, so each item was reachable by two paths. Make the
leaf modules private and route all callers through the single re-exported
path.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

7 files changed, 12 insertions, 14 deletions

diff --git a/crates/shirabe-symfony-console/src/output/buffered_output.rs b/crates/shirabe-symfony-console/src/output/buffered_output.rs
index 147f837f..07a47779 100644
--- a/crates/shirabe-symfony-console/src/output/buffered_output.rs
+++ b/crates/shirabe-symfony-console/src/output/buffered_output.rs
@@ -2,7 +2,7 @@
 
 use crate::formatter::OutputFormatterInterface;
 use crate::output::OutputInterface;
-use crate::output::output::{DoWrite, Output};
+use crate::output::{DoWrite, Output};
 
 #[derive(Debug)]
 pub struct BufferedOutput {
diff --git a/crates/shirabe-symfony-console/src/output/console_output.rs b/crates/shirabe-symfony-console/src/output/console_output.rs
index 5028eaf7..4080d688 100644
--- a/crates/shirabe-symfony-console/src/output/console_output.rs
+++ b/crates/shirabe-symfony-console/src/output/console_output.rs
@@ -2,10 +2,10 @@
 
 use crate::formatter::OutputFormatterInterface;
 use crate::output::ConsoleOutputInterface;
+use crate::output::ConsoleSectionOutput;
 use crate::output::OutputInterface;
-use crate::output::console_section_output::ConsoleSectionOutput;
-use crate::output::output_interface::VERBOSITY_NORMAL;
-use crate::output::stream_output::StreamOutput;
+use crate::output::StreamOutput;
+use crate::output::VERBOSITY_NORMAL;
 
 /// ConsoleOutput is the default class for all CLI output. It uses STDOUT and STDERR.
 ///
diff --git a/crates/shirabe-symfony-console/src/output/console_section_output.rs b/crates/shirabe-symfony-console/src/output/console_section_output.rs
index 2b42ad02..9a2cb9ec 100644
--- a/crates/shirabe-symfony-console/src/output/console_section_output.rs
+++ b/crates/shirabe-symfony-console/src/output/console_section_output.rs
@@ -2,9 +2,9 @@
 
 use crate::formatter::OutputFormatterInterface;
 use crate::helper::Helper;
+use crate::output::DoWrite;
 use crate::output::OutputInterface;
-use crate::output::output::DoWrite;
-use crate::output::stream_output::StreamOutput;
+use crate::output::StreamOutput;
 use crate::terminal::Terminal;
 
 type Sections =
@@ -79,7 +79,7 @@ impl ConsoleSectionOutput {
     /// Overwrites the previous output with a new message.
     pub fn overwrite(&self, message: &[String]) {
         self.clear(None);
-        self.writeln(message, crate::output::output_interface::OUTPUT_NORMAL);
+        self.writeln(message, crate::output::OUTPUT_NORMAL);
     }
 
     pub fn get_content(&self) -> String {
diff --git a/crates/shirabe-symfony-console/src/output/output.rs b/crates/shirabe-symfony-console/src/output/output.rs
index 98566a4e..2df7733a 100644
--- a/crates/shirabe-symfony-console/src/output/output.rs
+++ b/crates/shirabe-symfony-console/src/output/output.rs
@@ -2,7 +2,7 @@
 
 use crate::formatter::OutputFormatter;
 use crate::formatter::OutputFormatterInterface;
-use crate::output::output_interface::{
+use crate::output::{
     OUTPUT_NORMAL, OUTPUT_PLAIN, OUTPUT_RAW, VERBOSITY_DEBUG, VERBOSITY_NORMAL, VERBOSITY_QUIET,
     VERBOSITY_VERBOSE, VERBOSITY_VERY_VERBOSE,
 };
diff --git a/crates/shirabe-symfony-console/src/output/output_interface.rs b/crates/shirabe-symfony-console/src/output/output_interface.rs
index cdc78144..f41cb056 100644
--- a/crates/shirabe-symfony-console/src/output/output_interface.rs
+++ b/crates/shirabe-symfony-console/src/output/output_interface.rs
@@ -56,9 +56,7 @@ pub trait OutputInterface: std::fmt::Debug + shirabe_php_shim::AsAny {
 
     /// Downcast hook standing in for PHP's `$output instanceof ConsoleOutputInterface`
     /// (cf. `InputInterface::as_streamable`). Only `ConsoleOutput` returns `Some`.
-    fn as_console_output(
-        &self,
-    ) -> Option<&dyn crate::output::console_output_interface::ConsoleOutputInterface> {
+    fn as_console_output(&self) -> Option<&dyn crate::output::ConsoleOutputInterface> {
         None
     }
 }
diff --git a/crates/shirabe-symfony-console/src/output/stream_output.rs b/crates/shirabe-symfony-console/src/output/stream_output.rs
index 1ed90cac..8ffe7e82 100644
--- a/crates/shirabe-symfony-console/src/output/stream_output.rs
+++ b/crates/shirabe-symfony-console/src/output/stream_output.rs
@@ -3,8 +3,8 @@
 use crate::exception::InvalidArgumentException;
 use crate::formatter::OutputFormatterInterface;
 use crate::output::OutputInterface;
-use crate::output::output::{DoWrite, Output};
-use crate::output::output_interface::VERBOSITY_NORMAL;
+use crate::output::VERBOSITY_NORMAL;
+use crate::output::{DoWrite, Output};
 use shirabe_php_shim::php_regex;
 
 /// StreamOutput writes the output to a given stream.
diff --git a/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs b/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs
index 9f8be71a..1cd3f2a1 100644
--- a/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs
+++ b/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs
@@ -3,7 +3,7 @@
 use crate::exception::InvalidArgumentException;
 use crate::formatter::OutputFormatterInterface;
 use crate::output::OutputInterface;
-use crate::output::output::{DoWrite, Output};
+use crate::output::{DoWrite, Output};
 
 /// A BufferedOutput that keeps only the last N chars.
 #[derive(Debug)]