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/util/no_proxy_pattern.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'crates/shirabe/src/util/no_proxy_pattern.rs') diff --git a/crates/shirabe/src/util/no_proxy_pattern.rs b/crates/shirabe/src/util/no_proxy_pattern.rs index 7d4d7b84..6d19637a 100644 --- a/crates/shirabe/src/util/no_proxy_pattern.rs +++ b/crates/shirabe/src/util/no_proxy_pattern.rs @@ -12,11 +12,11 @@ use shirabe_php_shim::{ #[derive(Debug)] pub struct NoProxyPattern { /// @var string[] - pub(crate) host_names: Vec, + host_names: Vec, /// @var (null|object)[] - pub(crate) rules: IndexMap>, + rules: IndexMap>, /// @var bool - pub(crate) noproxy: bool, + noproxy: bool, } #[derive(Debug, Clone)] @@ -69,7 +69,7 @@ impl NoProxyPattern { } /// Returns false is the url cannot be parsed, otherwise a data object - pub(crate) fn get_url_data(&self, url: &str) -> anyhow::Result> { + fn get_url_data(&self, url: &str) -> anyhow::Result> { let host = parse_url(url, PHP_URL_HOST); if empty(&host) { return Ok(None); @@ -107,12 +107,7 @@ impl NoProxyPattern { } /// Returns true if the url is matched by a rule - pub(crate) fn r#match( - &mut self, - index: i64, - host_name: &str, - url: &UrlData, - ) -> anyhow::Result { + fn r#match(&mut self, index: i64, host_name: &str, url: &UrlData) -> anyhow::Result { let rule = match self.get_rule(index, host_name)? { Some(r) => r, None => { @@ -148,7 +143,7 @@ impl NoProxyPattern { } /// Returns true if the target ip is in the network range - pub(crate) fn match_range(&self, network: &IpData, target: &IpData) -> anyhow::Result { + fn match_range(&self, network: &IpData, target: &IpData) -> anyhow::Result { let net = network.ip.as_slice(); let mask = network.netmask.as_deref().unwrap_or_default(); let ip = target.ip.as_slice(); -- cgit v1.3.1-4-g156e