From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id F30601FF144 for ; Tue, 24 Mar 2026 13:36:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA5A9E433; Tue, 24 Mar 2026 13:37:17 +0100 (CET) Date: Tue, 24 Mar 2026 13:37:12 +0100 From: Wolfgang Bumiller To: Gabriel Goller Subject: applied: [PATCH proxmox v2] schema: api_string_type: impl FromStr to avoid allocating in error path Message-ID: References: <20260323092140.42275-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260323092140.42275-1-g.goller@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774355785595 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: 4T5BP7KLTULMZYR55RWM3D7YEACVLIEG X-Message-ID-Hash: 4T5BP7KLTULMZYR55RWM3D7YEACVLIEG X-MailFrom: w.bumiller@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 CC: pve-devel@lists.proxmox.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: applied, and added a follow up replacing the two schema type checks with a const block for compile time checking using or `.unwrap_string_schema()` const fn helper. On Mon, Mar 23, 2026 at 10:21:33AM +0100, Gabriel Goller wrote: > The existing from_string takes ownership of a String, meaning callers > with a &str had to heap-allocate first and discard the allocation on > validation failure. The new FromStr implementation validates the &str > against the schema's check_constraints before calling to_string(), so no > allocation happens on the error path. > > Suggested-by: Wolfgang Bumiller > Signed-off-by: Gabriel Goller > --- > > Changelog: > v2: > - implemented FromStr trait instead of simple from_str method > > proxmox-schema/src/api_type_macros.rs | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/proxmox-schema/src/api_type_macros.rs b/proxmox-schema/src/api_type_macros.rs > index f3740d14fd35..4f2e54d4e63e 100644 > --- a/proxmox-schema/src/api_type_macros.rs > +++ b/proxmox-schema/src/api_type_macros.rs > @@ -21,6 +21,7 @@ > /// * `Display` as a pass-through to `String`'s `Display` > /// * `Deref` > /// * `DerefMut` > +/// * `FromStr` > /// * `AsRef` > /// * `TryFrom` > /// * `fn into_string(self) -> String` > @@ -68,6 +69,19 @@ macro_rules! api_string_type { > } > } > > + impl ::std::str::FromStr for $name { > + type Err = ::anyhow::Error; > + > + fn from_str(inner: &str) -> Result { > + use $crate::ApiType; > + match &Self::API_SCHEMA { > + $crate::Schema::String(s) => s.check_constraints(inner)?, > + _ => unreachable!(), > + } > + Ok(Self(inner.to_string())) > + } > + } > + > impl $name { > /// Get the contained string. > pub fn into_string(self) -> String { > -- > 2.47.3 > > > > >