From 3a388b98a9aa6a14b1c7f7dc909c109cf9837800 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 16 Aug 2026 00:59:54 +0900 Subject: refactor: narrow pub(crate) items to private Porting mapped every PHP `protected` member onto `pub(crate)`, which is wider than nearly all of them need. Each item demoted here is reached only from the module that defines it, so the crate-wide visibility conveyed nothing. Every `pub(crate)` that survives has at least one reader in another module of the same crate. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/package/alias_package.rs | 12 ++-- .../package/archiver/archivable_files_finder.rs | 2 +- .../src/package/archiver/archive_manager.rs | 8 +-- crates/shirabe/src/package/complete_package.rs | 24 ++++---- crates/shirabe/src/package/link.rs | 10 ++-- crates/shirabe/src/package/loader/array_loader.rs | 2 +- crates/shirabe/src/package/package.rs | 66 +++++++++++----------- crates/shirabe/src/package/root_package.rs | 12 ++-- 8 files changed, 68 insertions(+), 68 deletions(-) (limited to 'crates/shirabe/src/package') diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs index 52b6efa4..9df804f1 100644 --- a/crates/shirabe/src/package/alias_package.rs +++ b/crates/shirabe/src/package/alias_package.rs @@ -23,18 +23,18 @@ pub struct AliasPackage { repository: Option, /// @var string - pub(crate) version: String, + version: String, /// @var string - pub(crate) pretty_version: String, + pretty_version: String, /// @var bool - pub(crate) dev: bool, + dev: bool, /// @var bool - pub(crate) root_package_alias: bool, + root_package_alias: bool, /// @var string /// @phpstan-var 'stable'|'RC'|'beta'|'alpha'|'dev' - pub(crate) stability: String, + stability: String, /// @var bool - pub(crate) has_self_version_requires: bool, + has_self_version_requires: bool, /// @var BasePackage pub(crate) alias_of: PackageHandle, diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs index 72fe0646..8fba18cb 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs @@ -10,7 +10,7 @@ use shirabe_symfony_finder::Finder; use std::path::{Path, PathBuf}; pub struct ArchivableFilesFinder { - pub(crate) finder: Finder, + finder: Finder, inner_iter: Box>, } diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index 0d99d301..a0216d88 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -17,10 +17,10 @@ use shirabe_php_shim::{ }; pub struct ArchiveManager { - pub(crate) download_manager: std::rc::Rc>, - pub(crate) r#loop: std::rc::Rc>, - pub(crate) archivers: Vec>, - pub(crate) overwrite_files: bool, + download_manager: std::rc::Rc>, + r#loop: std::rc::Rc>, + archivers: Vec>, + overwrite_files: bool, } impl std::fmt::Debug for ArchiveManager { diff --git a/crates/shirabe/src/package/complete_package.rs b/crates/shirabe/src/package/complete_package.rs index b2c3978c..00b4a67c 100644 --- a/crates/shirabe/src/package/complete_package.rs +++ b/crates/shirabe/src/package/complete_package.rs @@ -11,18 +11,18 @@ use shirabe_php_shim::PhpMixed; #[derive(Debug, Clone)] pub struct CompletePackage { pub(crate) inner: Package, - pub(crate) repositories: IndexMap, - pub(crate) license: Vec, - pub(crate) keywords: Vec, - pub(crate) authors: Vec>, - pub(crate) description: Option, - pub(crate) homepage: Option, - pub(crate) scripts: IndexMap>, - pub(crate) support: IndexMap, - pub(crate) funding: Vec>, - pub(crate) abandoned: PhpMixed, - pub(crate) archive_name: Option, - pub(crate) archive_excludes: Vec, + repositories: IndexMap, + license: Vec, + keywords: Vec, + authors: Vec>, + description: Option, + homepage: Option, + scripts: IndexMap>, + support: IndexMap, + funding: Vec>, + abandoned: PhpMixed, + archive_name: Option, + archive_excludes: Vec, } impl CompletePackage { diff --git a/crates/shirabe/src/package/link.rs b/crates/shirabe/src/package/link.rs index 027fa009..fc0a8063 100644 --- a/crates/shirabe/src/package/link.rs +++ b/crates/shirabe/src/package/link.rs @@ -5,11 +5,11 @@ use shirabe_semver::constraint::AnyConstraint; #[derive(Clone, Debug)] pub struct Link { - pub(crate) source: String, - pub(crate) target: String, - pub(crate) constraint: AnyConstraint, - pub(crate) description: String, - pub(crate) pretty_constraint: String, + source: String, + target: String, + constraint: AnyConstraint, + description: String, + pretty_constraint: String, } impl Link { diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index df588cf9..21811f14 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -29,7 +29,7 @@ pub struct ArrayLoader { /// @var VersionParser pub(crate) version_parser: VersionParser, /// @var bool - pub(crate) load_options: bool, + load_options: bool, } impl ArrayLoader { diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index ee1a5e10..4e35ee55 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -31,41 +31,41 @@ pub struct Package { /// Back-reference to the owning repository. `Weak` breaks the repository -> packages cycle. repository: Option, - pub(crate) r#type: Option, - pub(crate) target_dir: Option, + r#type: Option, + target_dir: Option, /// `'source'` | `'dist'` | `null` - pub(crate) installation_source: Option, - pub(crate) source_type: Option, - pub(crate) source_url: Option, - pub(crate) source_reference: Option, - pub(crate) source_mirrors: Option>, - pub(crate) dist_type: Option, - pub(crate) dist_url: Option, - pub(crate) dist_reference: Option, - pub(crate) dist_sha1_checksum: Option, - pub(crate) dist_mirrors: Option>, - pub(crate) version: String, - pub(crate) pretty_version: String, - pub(crate) release_date: Option>, - pub(crate) extra: IndexMap, - pub(crate) binaries: Vec, - pub(crate) dev: bool, + installation_source: Option, + source_type: Option, + source_url: Option, + source_reference: Option, + source_mirrors: Option>, + dist_type: Option, + dist_url: Option, + dist_reference: Option, + dist_sha1_checksum: Option, + dist_mirrors: Option>, + version: String, + pretty_version: String, + release_date: Option>, + extra: IndexMap, + binaries: Vec, + dev: bool, /// `'stable'` | `'RC'` | `'beta'` | `'alpha'` | `'dev'` - pub(crate) stability: String, - pub(crate) notification_url: Option, - - pub(crate) requires: IndexMap, - pub(crate) conflicts: IndexMap, - pub(crate) provides: IndexMap, - pub(crate) replaces: IndexMap, - pub(crate) dev_requires: IndexMap, - pub(crate) suggests: IndexMap, - pub(crate) autoload: IndexMap, - pub(crate) dev_autoload: IndexMap, - pub(crate) include_paths: Vec, - pub(crate) is_default_branch: bool, - pub(crate) transport_options: IndexMap, - pub(crate) php_ext: Option>, + stability: String, + notification_url: Option, + + requires: IndexMap, + conflicts: IndexMap, + provides: IndexMap, + replaces: IndexMap, + dev_requires: IndexMap, + suggests: IndexMap, + autoload: IndexMap, + dev_autoload: IndexMap, + include_paths: Vec, + is_default_branch: bool, + transport_options: IndexMap, + php_ext: Option>, } impl Package { diff --git a/crates/shirabe/src/package/root_package.rs b/crates/shirabe/src/package/root_package.rs index 2c2b87ea..0807d15b 100644 --- a/crates/shirabe/src/package/root_package.rs +++ b/crates/shirabe/src/package/root_package.rs @@ -15,12 +15,12 @@ use shirabe_php_shim::PhpMixed; #[derive(Debug, Clone)] pub struct RootPackage { pub(crate) inner: CompletePackage, - pub(crate) minimum_stability: String, - pub(crate) prefer_stable: bool, - pub(crate) stability_flags: IndexMap, - pub(crate) config: IndexMap, - pub(crate) references: IndexMap, - pub(crate) aliases: Vec>, + minimum_stability: String, + prefer_stable: bool, + stability_flags: IndexMap, + config: IndexMap, + references: IndexMap, + aliases: Vec>, } impl RootPackage { -- cgit v1.3.1-4-g156e