From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox 14/15] clippy fix: complex type definitions
Date: Tue, 8 Aug 2023 10:01:52 +0200 [thread overview]
Message-ID: <20230808080153.79587-14-l.wagner@proxmox.com> (raw)
In-Reply-To: <20230808080153.79587-1-l.wagner@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
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<APTRepositoryFile>,
+ Vec<APTRepositoryFileError>,
+ [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<APTRepositoryFile>,
- Vec<APTRepositoryFileError>,
- [u8; 32],
- ),
- Error,
-> {
+pub fn repositories() -> Result<Repositories, Error> {
let to_result = |files: Vec<APTRepositoryFile>, errors: Vec<APTRepositoryFileError>| {
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<Result<(Option<&str>, Cow<str>, &str), Error>> {
+pub(crate) fn next_property(mut data: &str) -> Option<Result<NextProperty, Error>> {
if data.is_empty() {
return None;
}
--
2.39.2
next prev parent reply other threads:[~2023-08-08 8:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 8:01 [pbs-devel] [PATCH proxmox 01/15] clippy fix: the borrowed expression implements the required traits Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 02/15] clippy fix: casting to the same type is unnecessary Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 03/15] clippy fix: calls to `drop` with a value that implements `Copy` Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 04/15] clippy fix: needless borrow Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 05/15] clippy fix: unneeded `return` statement Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 06/15] clippy fix: redundant closure Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 07/15] clippy fix: this (Default) `impl` can be derived Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 08/15] clippy fix: you should consider adding a `Default` implementation Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 09/15] clippy fix: unnecessary use of `to_string` Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 10/15] clippy fix: binary comparison to literal `Option::None` Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 11/15] clippy fix: warning: this let-binding has unit value Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 12/15] clippy fix: useless use of `format!` Lukas Wagner
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 13/15] clippy fix: the following explicit lifetimes could be elided Lukas Wagner
2023-08-08 8:01 ` Lukas Wagner [this message]
2023-08-08 8:01 ` [pbs-devel] [PATCH proxmox 15/15] clippy fix: deref on an immutable reference Lukas Wagner
2023-08-08 9:33 ` [pbs-devel] partially-applied: [PATCH proxmox 01/15] clippy fix: the borrowed expression implements the required traits Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230808080153.79587-14-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox