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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2467061CE7 for ; Fri, 18 Dec 2020 12:38:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D2C822F929 for ; Fri, 18 Dec 2020 12:37:41 +0100 (CET) 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 2B98F2F835 for ; Fri, 18 Dec 2020 12:37:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8137C453A8 for ; Fri, 18 Dec 2020 12:26:22 +0100 (CET) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Fri, 18 Dec 2020 12:25:54 +0100 Message-Id: <20201218112608.6845-7-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201218112608.6845-1-w.bumiller@proxmox.com> References: <20201218112608.6845-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [serde.rs] Subject: [pbs-devel] [PATCH proxmox 06/18] api-macro: add 'flatten' to SerdeAttrib 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: Fri, 18 Dec 2020 11:38:12 -0000 Signed-off-by: Wolfgang Bumiller --- proxmox-api-macro/src/serde.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/proxmox-api-macro/src/serde.rs b/proxmox-api-macro/src/serde.rs index a08f461..2829030 100644 --- a/proxmox-api-macro/src/serde.rs +++ b/proxmox-api-macro/src/serde.rs @@ -159,12 +159,15 @@ impl TryFrom<&[syn::Attribute]> for ContainerAttrib { #[derive(Default)] pub struct SerdeAttrib { pub rename: Option, + pub flatten: bool, } impl TryFrom<&[syn::Attribute]> for SerdeAttrib { type Error = syn::Error; fn try_from(attributes: &[syn::Attribute]) -> Result { + use syn::{Meta, NestedMeta}; + let mut this: Self = Default::default(); for attrib in attributes { @@ -174,8 +177,8 @@ impl TryFrom<&[syn::Attribute]> for SerdeAttrib { let args: AttrArgs = syn::parse2(attrib.tokens.clone())?; for arg in args.args { - if let syn::NestedMeta::Meta(syn::Meta::NameValue(var)) = arg { - if var.path.is_ident("rename") { + match arg { + NestedMeta::Meta(Meta::NameValue(var)) if var.path.is_ident("rename") => { match var.lit { syn::Lit::Str(lit) => { let rename = FieldName::from(&lit); @@ -187,6 +190,10 @@ impl TryFrom<&[syn::Attribute]> for SerdeAttrib { _ => error!(var.lit => "'rename' value must be a string literal"), } } + NestedMeta::Meta(Meta::Path(path)) if path.is_ident("flatten") => { + this.flatten = true; + } + _ => continue, } } } -- 2.20.1