From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 33E861FF0B3 for ; Wed, 14 Oct 2026 16:44:08 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 2F3DB214D9; Wed, 14 Oct 2026 16:44:05 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v2 01/14] pbs-api-types: avoid reimplementation of is_false helper Date: Wed, 14 Oct 2026 16:43:44 +0200 Message-ID: <20261014144357.771051-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261014144357.771051-1-c.ebner@proxmox.com> References: <20261014144357.771051-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791989040901 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.537 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: VQ4C6PVDNKQ47S3X4HWYOOZYXXT2DR7G X-Message-ID-Hash: VQ4C6PVDNKQ47S3X4HWYOOZYXXT2DR7G X-MailFrom: c.ebner@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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Already implemented twice, move to a common crate wide implementation so the same can be reused also for future locations requiring serde deserialization to be skipped. Signed-off-by: Christian Ebner --- pbs-api-types/src/jobs.rs | 6 +----- pbs-api-types/src/lib.rs | 5 +++++ pbs-api-types/src/user.rs | 6 +----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index 9a5d2b77..e93a1ce4 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -919,7 +919,7 @@ pub struct PruneJobConfig { pub store: String, /// Disable this job. - #[serde(default, skip_serializing_if = "is_false")] + #[serde(default, skip_serializing_if = "crate::is_false")] #[updater(serde(skip_serializing_if = "Option::is_none"))] pub disable: bool, @@ -938,10 +938,6 @@ impl PruneJobConfig { } } -fn is_false(b: &bool) -> bool { - !b -} - #[api( properties: { config: { diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index 21ef733d..1555f3f8 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -486,3 +486,8 @@ impl Default for PbsRealmConfig { } } } + +// Helper to skip serialization of boolean flags +pub(crate) fn is_false(b: &bool) -> bool { + !b +} diff --git a/pbs-api-types/src/user.rs b/pbs-api-types/src/user.rs index a5368916..3f864ffb 100644 --- a/pbs-api-types/src/user.rs +++ b/pbs-api-types/src/user.rs @@ -109,16 +109,12 @@ pub struct UserWithTokens { pub email: Option, #[serde(skip_serializing_if = "Vec::is_empty", default)] pub tokens: Vec, - #[serde(skip_serializing_if = "bool_is_false", default)] + #[serde(skip_serializing_if = "crate::is_false", default)] pub totp_locked: bool, #[serde(skip_serializing_if = "Option::is_none")] pub tfa_locked_until: Option, } -fn bool_is_false(b: &bool) -> bool { - !b -} - #[api( properties: { tokenid: { -- 2.47.3