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) --- .../src/descriptor/application_description.rs | 4 ++-- .../src/descriptor/descriptor.rs | 16 ++++++++-------- .../src/descriptor/descriptor_interface.rs | 10 +++++----- .../src/descriptor/json_descriptor.rs | 16 ++++++++-------- .../src/descriptor/markdown_descriptor.rs | 22 +++++++++++----------- .../src/descriptor/text_descriptor.rs | 20 ++++++++++---------- .../src/descriptor/xml_descriptor.rs | 16 ++++++++-------- 7 files changed, 52 insertions(+), 52 deletions(-) (limited to 'crates/shirabe-symfony-console/src/descriptor') diff --git a/crates/shirabe-symfony-console/src/descriptor/application_description.rs b/crates/shirabe-symfony-console/src/descriptor/application_description.rs index d63f0be2..7b9a9e3d 100644 --- a/crates/shirabe-symfony-console/src/descriptor/application_description.rs +++ b/crates/shirabe-symfony-console/src/descriptor/application_description.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Descriptor/ApplicationDescription.php use crate::application::Application; -use crate::command::command::Command; -use crate::exception::command_not_found_exception::CommandNotFoundException; +use crate::command::Command; +use crate::exception::CommandNotFoundException; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/descriptor/descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/descriptor.rs index f3647d7c..d06f60ca 100644 --- a/crates/shirabe-symfony-console/src/descriptor/descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/descriptor.rs @@ -1,12 +1,12 @@ //! ref: composer/vendor/symfony/console/Descriptor/Descriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; @@ -53,9 +53,9 @@ pub trait Descriptor: DescriptorInterface { &[content.to_string()], false, if decorated { - crate::output::output_interface::OUTPUT_NORMAL + crate::output::OUTPUT_NORMAL } else { - crate::output::output_interface::OUTPUT_RAW + crate::output::OUTPUT_RAW }, ); } diff --git a/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs b/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs index c50c6a99..928c4294 100644 --- a/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs +++ b/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs @@ -1,11 +1,11 @@ //! ref: composer/vendor/symfony/console/Descriptor/DescriptorInterface.php use crate::application::Application; -use crate::command::command::Command; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs index 983d5f08..a195dc01 100644 --- a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs @@ -1,14 +1,14 @@ //! ref: composer/vendor/symfony/console/Descriptor/JsonDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PhpMixed, php_regex}; diff --git a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs index b64c2be0..8c814bb5 100644 --- a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs @@ -1,15 +1,15 @@ //! ref: composer/vendor/symfony/console/Descriptor/MarkdownDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::helper::helper::Helper; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::helper::Helper; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::PhpMixed; @@ -329,9 +329,9 @@ impl Descriptor for MarkdownDescriptor { &[content.to_string()], false, if decorated { - crate::output::output_interface::OUTPUT_NORMAL + crate::output::OUTPUT_NORMAL } else { - crate::output::output_interface::OUTPUT_RAW + crate::output::OUTPUT_RAW }, ); } diff --git a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs index 3ea09355..0308415f 100644 --- a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs @@ -1,16 +1,16 @@ //! ref: composer/vendor/symfony/console/Descriptor/TextDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::formatter::output_formatter::OutputFormatter; -use crate::helper::helper::Helper; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::formatter::OutputFormatter; +use crate::helper::Helper; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs index 11c26b46..1a001b22 100644 --- a/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs @@ -1,14 +1,14 @@ //! ref: composer/vendor/symfony/console/Descriptor/XmlDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::{DOMDocument, DOMNode, PhpMixed}; -- cgit v1.3.1-4-g156e