From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 17C8E62390 for ; Wed, 16 Sep 2020 14:09:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F2F702388D for ; Wed, 16 Sep 2020 14:09:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4414723884 for ; Wed, 16 Sep 2020 14:09:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 042C5453CE for ; Wed, 16 Sep 2020 14:09:46 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 16 Sep 2020 14:09:45 +0200 Message-Id: <20200916120945.12073-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916120945.12073-1-d.csapak@proxmox.com> References: <20200916120945.12073-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.177 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [util.rs] Subject: [pbs-devel] [PATCH proxmox 2/2] api-macro: relax Fieldname rules X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2020 12:09:47 -0000 by replacing more characters ('.','+') by '_' and prefix them when it starts with a number we sometimes need to parse such fields, e.g in serde attributes like #[serde(rename = "802.3ad")] Signed-off-by: Dominik Csapak --- proxmox-api-macro/src/util.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxmox-api-macro/src/util.rs b/proxmox-api-macro/src/util.rs index 6ac39c2..9748131 100644 --- a/proxmox-api-macro/src/util.rs +++ b/proxmox-api-macro/src/util.rs @@ -29,7 +29,11 @@ pub struct FieldName { impl FieldName { pub fn new(name: String, span: Span) -> Self { - let ident_str = name.replace("-", "_"); + let mut ident_str = name.replace(['-', '.', '+'].as_ref(), "_"); + + if ident_str.chars().next().unwrap().is_numeric() { + ident_str.insert(0, '_'); + } Self { ident: Ident::new(&ident_str, span), -- 2.20.1