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 D93961FF165 for ; Thu, 6 Nov 2025 15:38:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0CB171A74D; Thu, 6 Nov 2025 15:38:43 +0100 (CET) From: Shannon Sterz To: pdm-devel@lists.proxmox.com Date: Thu, 6 Nov 2025 15:38:28 +0100 Message-ID: <20251106143836.288888-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251106143836.288888-1-s.sterz@proxmox.com> References: <20251106143836.288888-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762439899252 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.060 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [acl.rs] Subject: [pdm-devel] [PATCH proxmox v3 2/5] access-control: use format strings where possible X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Signed-off-by: Shannon Sterz --- proxmox-access-control/src/acl.rs | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/proxmox-access-control/src/acl.rs b/proxmox-access-control/src/acl.rs index 7813ea5d..f2589e57 100644 --- a/proxmox-access-control/src/acl.rs +++ b/proxmox-access-control/src/acl.rs @@ -335,7 +335,7 @@ impl AclTree { for user_or_group in &uglist { for role in &rolelist { if !access_conf().roles().contains_key(role) { - bail!("unknown role '{}'", role); + bail!("unknown role '{role}'"); } if let Some(group) = user_or_group.strip_prefix('@') { node.insert_group_role(group.to_string(), role.to_string(), propagate); @@ -358,9 +358,8 @@ impl AclTree { } if let Err(err) = tree.parse_acl_line(line) { bail!( - "unable to parse acl config data, line {} - {}", + "unable to parse acl config data, line {} - {err}", linenr + 1, - err ); } } @@ -493,10 +492,8 @@ impl AclTree { let role_list = role_list(roles); writeln!( w, - "acl:0:{}:{}:{}", + "acl:0:{}:{uglist}:{role_list}", if path.is_empty() { "/" } else { path }, - uglist, - role_list )?; } @@ -504,10 +501,8 @@ impl AclTree { let role_list = role_list(roles); writeln!( w, - "acl:1:{}:{}:{}", + "acl:1:{}:{uglist}:{role_list}", if path.is_empty() { "/" } else { path }, - uglist, - role_list )?; } @@ -532,7 +527,7 @@ impl AclTree { if err.kind() == std::io::ErrorKind::NotFound { String::new() } else { - bail!("unable to read acl config {:?} - {}", filename, err); + bail!("unable to read acl config {filename:?} - {err}"); } } }; @@ -546,10 +541,8 @@ impl AclTree { } if let Err(err) = tree.parse_acl_line(line) { bail!( - "unable to parse acl config {:?}, line {} - {}", - filename, - linenr + 1, - err + "unable to parse acl config {filename:?}, line {} - {err}", + linenr + 1 ); } } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel