From 9d9da0d1512202af7802d13b1c3c33a1a077a84e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 10 Aug 2026 04:38:35 +0900 Subject: 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) --- crates/shirabe-symfony-console/src/input/argv_input.rs | 10 +++++----- crates/shirabe-symfony-console/src/input/array_input.rs | 12 ++++++------ crates/shirabe-symfony-console/src/input/input.rs | 6 +++--- crates/shirabe-symfony-console/src/input/input_argument.rs | 4 ++-- .../src/input/input_aware_interface.rs | 2 +- crates/shirabe-symfony-console/src/input/input_definition.rs | 8 ++++---- crates/shirabe-symfony-console/src/input/input_interface.rs | 4 ++-- crates/shirabe-symfony-console/src/input/input_option.rs | 4 ++-- .../src/input/streamable_input_interface.rs | 2 +- crates/shirabe-symfony-console/src/input/string_input.rs | 10 +++++----- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'crates/shirabe-symfony-console/src/input') diff --git a/crates/shirabe-symfony-console/src/input/argv_input.rs b/crates/shirabe-symfony-console/src/input/argv_input.rs index d8619df9..cbd0f6d2 100644 --- a/crates/shirabe-symfony-console/src/input/argv_input.rs +++ b/crates/shirabe-symfony-console/src/input/argv_input.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/console/Input/ArgvInput.php -use crate::exception::runtime_exception::RuntimeException; -use crate::input::input::Input; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::exception::RuntimeException; +use crate::input::Input; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::StreamableInputInterface; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, php_regex}; diff --git a/crates/shirabe-symfony-console/src/input/array_input.rs b/crates/shirabe-symfony-console/src/input/array_input.rs index fa1d4540..d93501c7 100644 --- a/crates/shirabe-symfony-console/src/input/array_input.rs +++ b/crates/shirabe-symfony-console/src/input/array_input.rs @@ -1,11 +1,11 @@ //! ref: composer/vendor/symfony/console/Input/ArrayInput.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::invalid_option_exception::InvalidOptionException; -use crate::input::input::Input; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::exception::InvalidArgumentException; +use crate::exception::InvalidOptionException; +use crate::input::Input; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::StreamableInputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/input/input.rs b/crates/shirabe-symfony-console/src/input/input.rs index 15190665..0da2b95c 100644 --- a/crates/shirabe-symfony-console/src/input/input.rs +++ b/crates/shirabe-symfony-console/src/input/input.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Input/Input.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::runtime_exception::RuntimeException; -use crate::input::input_definition::InputDefinition; +use crate::exception::InvalidArgumentException; +use crate::exception::RuntimeException; +use crate::input::InputDefinition; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, PhpResource, php_regex}; diff --git a/crates/shirabe-symfony-console/src/input/input_argument.rs b/crates/shirabe-symfony-console/src/input/input_argument.rs index ebc8e223..5ca91a6b 100644 --- a/crates/shirabe-symfony-console/src/input/input_argument.rs +++ b/crates/shirabe-symfony-console/src/input/input_argument.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Input/InputArgument.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; use shirabe_php_shim::PhpMixed; #[derive(Debug, Clone)] diff --git a/crates/shirabe-symfony-console/src/input/input_aware_interface.rs b/crates/shirabe-symfony-console/src/input/input_aware_interface.rs index 1638b6c7..38b02cec 100644 --- a/crates/shirabe-symfony-console/src/input/input_aware_interface.rs +++ b/crates/shirabe-symfony-console/src/input/input_aware_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Input/InputAwareInterface.php -use crate::input::input_interface::InputInterface; +use crate::input::InputInterface; pub trait InputAwareInterface { fn set_input(&mut self, input: Box); diff --git a/crates/shirabe-symfony-console/src/input/input_definition.rs b/crates/shirabe-symfony-console/src/input/input_definition.rs index 96f9ce9a..8d116bc1 100644 --- a/crates/shirabe-symfony-console/src/input/input_definition.rs +++ b/crates/shirabe-symfony-console/src/input/input_definition.rs @@ -1,9 +1,9 @@ //! ref: composer/vendor/symfony/console/Input/InputDefinition.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; -use crate::input::input_argument::InputArgument; -use crate::input::input_option::InputOption; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; +use crate::input::InputArgument; +use crate::input::InputOption; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/input/input_interface.rs b/crates/shirabe-symfony-console/src/input/input_interface.rs index b3cd2eef..4491ca8c 100644 --- a/crates/shirabe-symfony-console/src/input/input_interface.rs +++ b/crates/shirabe-symfony-console/src/input/input_interface.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Input/InputInterface.php -use crate::input::input_definition::InputDefinition; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::input::InputDefinition; +use crate::input::StreamableInputInterface; use shirabe_php_shim::PhpMixed; pub trait InputInterface: std::fmt::Debug + shirabe_php_shim::AsAny { diff --git a/crates/shirabe-symfony-console/src/input/input_option.rs b/crates/shirabe-symfony-console/src/input/input_option.rs index 7312e552..6734f374 100644 --- a/crates/shirabe-symfony-console/src/input/input_option.rs +++ b/crates/shirabe-symfony-console/src/input/input_option.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Input/InputOption.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; use shirabe_php_shim::{PhpMixed, php_regex}; #[derive(Debug, Clone)] diff --git a/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs b/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs index 559b34a0..b9a8e766 100644 --- a/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs +++ b/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Input/StreamableInputInterface.php -use crate::input::input_interface::InputInterface; +use crate::input::InputInterface; use shirabe_php_shim::PhpResource; pub trait StreamableInputInterface: InputInterface { diff --git a/crates/shirabe-symfony-console/src/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs index 720e2bef..5e6d4e76 100644 --- a/crates/shirabe-symfony-console/src/input/string_input.rs +++ b/crates/shirabe-symfony-console/src/input/string_input.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/console/Input/StringInput.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::input::argv_input::ArgvInput; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::exception::InvalidArgumentException; +use crate::input::ArgvInput; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::StreamableInputInterface; use indexmap::IndexMap; use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex}; -- cgit v1.3.1-4-g156e