From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 1EC1B1FF0C0 for ; Wed, 18 Nov 2026 10:45:46 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id E43B8217A7; Wed, 18 Nov 2026 10:44:50 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox v2 19/63] notify: config: cleanup helper names and visibility Date: Wed, 18 Nov 2026 10:43:03 +0100 Message-ID: <20261118094348.273646-20-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118094348.273646-1-l.wagner@proxmox.com> References: <20261118094348.273646-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794995037244 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.198 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: EN3RQZX723Q4TU4Q27FF6S5NGSJJNTUD X-Message-ID-Hash: EN3RQZX723Q4TU4Q27FF6S5NGSJJNTUD X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Given that Config now lives in the same module, we can lower the visibility of these helpers. Signed-off-by: Lukas Wagner --- proxmox-notify/src/config.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proxmox-notify/src/config.rs b/proxmox-notify/src/config.rs index fcbf568f4..f7055b9ff 100644 --- a/proxmox-notify/src/config.rs +++ b/proxmox-notify/src/config.rs @@ -98,7 +98,7 @@ fn private_config_init() -> SectionConfig { config } -pub fn config(raw_config: &str) -> Result<(SectionConfigData, ConfigDigest), Error> { +fn parse_config(raw_config: &str) -> Result<(SectionConfigData, ConfigDigest), Error> { let digest = ConfigDigest::from_slice(raw_config.as_bytes()); let data = config_parser() .parse("notifications.cfg", raw_config) @@ -107,7 +107,7 @@ pub fn config(raw_config: &str) -> Result<(SectionConfigData, ConfigDigest), Err Ok((data, digest)) } -pub fn private_config(raw_config: &str) -> Result<(SectionConfigData, ConfigDigest), Error> { +fn parse_private_config(raw_config: &str) -> Result<(SectionConfigData, ConfigDigest), Error> { let digest = ConfigDigest::from_slice(raw_config.as_bytes()); let data = private_config_parser() .parse("priv/notifications.cfg", raw_config) @@ -116,13 +116,13 @@ pub fn private_config(raw_config: &str) -> Result<(SectionConfigData, ConfigDige Ok((data, digest)) } -pub fn write(config: &SectionConfigData) -> Result { +fn write(config: &SectionConfigData) -> Result { config_parser() .write("notifications.cfg", config) .map_err(Error::config_serialization) } -pub fn write_private(config: &SectionConfigData) -> Result { +fn write_private(config: &SectionConfigData) -> Result { private_config_parser() .write("priv/notifications.cfg", config) .map_err(Error::config_serialization) @@ -143,8 +143,8 @@ impl Config { raw_config: &str, raw_private_config: &str, ) -> Result { - let (mut config, digest) = config(raw_config)?; - let (private_config, _) = private_config(raw_private_config)?; + let (mut config, digest) = parse_config(raw_config)?; + let (private_config, _) = parse_private_config(raw_private_config)?; let default_config = context.default_config(); -- 2.47.3