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 D12999C01F for ; Mon, 23 Oct 2023 09:57:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B9F2D10769 for ; Mon, 23 Oct 2023 09:57:28 +0200 (CEST) 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 ; Mon, 23 Oct 2023 09:57:28 +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 E7B3C4421B for ; Mon, 23 Oct 2023 09:57:27 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 23 Oct 2023 09:57:24 +0200 Message-Id: <20231023075724.33737-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.308 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 Subject: [pbs-devel] [PATCH proxmox v2] schema: beautify parameter error output 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: Mon, 23 Oct 2023 07:57:28 -0000 If there is only one error, output in a single line, without any excessive newlines at the end. If there are multiple errors, show them in a bulleted list. Signed-off-by: Gabriel Goller --- proxmox-schema/src/schema.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/proxmox-schema/src/schema.rs b/proxmox-schema/src/schema.rs index f087706..21b9d8a 100644 --- a/proxmox-schema/src/schema.rs +++ b/proxmox-schema/src/schema.rs @@ -101,14 +101,18 @@ impl fmt::Display for ParameterError { let mut msg = String::new(); if !self.is_empty() { - msg.push_str("parameter verification errors\n\n"); - } - - for (name, err) in self.error_list.iter() { - let _ = writeln!(msg, "parameter '{}': {}", name, err); + if self.len() == 1 { + msg.push_str("parameter verification failed - "); + let _ = write!(msg, "'{}': {}", self.error_list[0].0, self.error_list[0].1); + } else { + msg.push_str("parameter verification failed:\n"); + for (name, err) in self.error_list.iter() { + let _ = writeln!(msg, "- '{}': {}", name, err); + } + } } - write!(f, "{}", msg) + write!(f, "{}", msg.trim()) } } -- 2.39.2