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 4DE0490E2A for ; Tue, 13 Feb 2024 10:03:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2FD2F32ECB for ; Tue, 13 Feb 2024 10:03:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Tue, 13 Feb 2024 10:03:15 +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 2012647B70 for ; Tue, 13 Feb 2024 10:03:15 +0100 (CET) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Tue, 13 Feb 2024 10:03:14 +0100 Message-Id: <20240213090314.111162-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213090314.111162-1-m.sandoval@proxmox.com> References: <20240213090314.111162-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lexer.rs] Subject: [pbs-devel] [PATCH backup 2/3] network: lexer: Simplify KEYWORDS declaration 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: Tue, 13 Feb 2024 09:03:47 -0000 Signed-off-by: Maximiliano Sandoval --- pbs-config/src/network/lexer.rs | 51 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/pbs-config/src/network/lexer.rs b/pbs-config/src/network/lexer.rs index 2ab5eb5a..c684338b 100644 --- a/pbs-config/src/network/lexer.rs +++ b/pbs-config/src/network/lexer.rs @@ -32,31 +32,32 @@ pub enum Token { } static KEYWORDS: Lazy> = Lazy::new(|| { - let mut map = HashMap::new(); - map.insert("address", Token::Address); - map.insert("auto", Token::Auto); - map.insert("dhcp", Token::DHCP); - map.insert("gateway", Token::Gateway); - map.insert("inet", Token::Inet); - map.insert("inet6", Token::Inet6); - map.insert("iface", Token::Iface); - map.insert("loopback", Token::Loopback); - map.insert("manual", Token::Manual); - map.insert("netmask", Token::Netmask); - map.insert("static", Token::Static); - map.insert("mtu", Token::MTU); - map.insert("bridge-ports", Token::BridgePorts); - map.insert("bridge_ports", Token::BridgePorts); - map.insert("bridge-vlan-aware", Token::BridgeVlanAware); - map.insert("bridge_vlan_aware", Token::BridgeVlanAware); - map.insert("bond-slaves", Token::BondSlaves); - map.insert("bond_slaves", Token::BondSlaves); - map.insert("bond-mode", Token::BondMode); - map.insert("bond-primary", Token::BondPrimary); - map.insert("bond_primary", Token::BondPrimary); - map.insert("bond_xmit_hash_policy", Token::BondXmitHashPolicy); - map.insert("bond-xmit-hash-policy", Token::BondXmitHashPolicy); - map + [ + ("address", Token::Address), + ("auto", Token::Auto), + ("dhcp", Token::DHCP), + ("gateway", Token::Gateway), + ("inet", Token::Inet), + ("inet6", Token::Inet6), + ("iface", Token::Iface), + ("loopback", Token::Loopback), + ("manual", Token::Manual), + ("netmask", Token::Netmask), + ("static", Token::Static), + ("mtu", Token::MTU), + ("bridge-ports", Token::BridgePorts), + ("bridge_ports", Token::BridgePorts), + ("bridge-vlan-aware", Token::BridgeVlanAware), + ("bridge_vlan_aware", Token::BridgeVlanAware), + ("bond-slaves", Token::BondSlaves), + ("bond_slaves", Token::BondSlaves), + ("bond-mode", Token::BondMode), + ("bond-primary", Token::BondPrimary), + ("bond_primary", Token::BondPrimary), + ("bond_xmit_hash_policy", Token::BondXmitHashPolicy), + ("bond-xmit-hash-policy", Token::BondXmitHashPolicy), + ] + .into() }); pub struct Lexer { -- 2.39.2