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 BEEB3AC81 for ; Tue, 8 Aug 2023 10:02:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7F78B686C for ; Tue, 8 Aug 2023 10:02:07 +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 ; Tue, 8 Aug 2023 10:02:05 +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 047D3436A7 for ; Tue, 8 Aug 2023 10:02:05 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 8 Aug 2023 10:01:52 +0200 Message-Id: <20230808080153.79587-14-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230808080153.79587-1-l.wagner@proxmox.com> References: <20230808080153.79587-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 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 14/15] clippy fix: complex type definitions 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, 08 Aug 2023 08:02:39 -0000 Signed-off-by: Lukas Wagner --- proxmox-apt/src/repositories/mod.rs | 20 +++++++++----------- proxmox-schema/src/property_string.rs | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/proxmox-apt/src/repositories/mod.rs b/proxmox-apt/src/repositories/mod.rs index b2e83a0..45adc85 100644 --- a/proxmox-apt/src/repositories/mod.rs +++ b/proxmox-apt/src/repositories/mod.rs @@ -113,21 +113,19 @@ pub fn standard_repositories( result } +/// Type containing successfully parsed files, a list of errors for files that +/// could not be read and a common digest for the successfully parsed files. +pub type Repositories = ( + Vec, + Vec, + [u8; 32], +); + /// Returns all APT repositories configured in `/etc/apt/sources.list` and /// in `/etc/apt/sources.list.d` including disabled repositories. /// -/// Returns the succesfully parsed files, a list of errors for files that could -/// not be read or parsed and a common digest for the succesfully parsed files. -/// /// The digest is guaranteed to be set for each successfully parsed file. -pub fn repositories() -> Result< - ( - Vec, - Vec, - [u8; 32], - ), - Error, -> { +pub fn repositories() -> Result { let to_result = |files: Vec, errors: Vec| { let common_digest = common_digest(&files); diff --git a/proxmox-schema/src/property_string.rs b/proxmox-schema/src/property_string.rs index 36bc0e7..7dd60f7 100644 --- a/proxmox-schema/src/property_string.rs +++ b/proxmox-schema/src/property_string.rs @@ -40,10 +40,10 @@ impl<'a> Iterator for PropertyIterator<'a> { } } +type NextProperty<'a> = (Option<&'a str>, Cow<'a, str>, &'a str); + /// Returns an optional key, its value, and the remainder of `data`. -pub(crate) fn next_property( - mut data: &str, -) -> Option, Cow, &str), Error>> { +pub(crate) fn next_property(mut data: &str) -> Option> { if data.is_empty() { return None; } -- 2.39.2