konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

clippy fix: complex type definitions

Browse Source 
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2023-08-08 10:01:52 +02:00 committed by Wolfgang Bumiller
parent 3c7c9fc55d
commit a36769b11a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxmox-apt/src/repositories/mod.rs
View File

@ -113,21 +113,19 @@ pub fn standard_repositories(
result
}
/// 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<
(
/// 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],
),
Error,
> {
);
/// Returns all APT repositories configured in `/etc/apt/sources.list` and
/// in `/etc/apt/sources.list.d` including disabled repositories.
///
/// The digest is guaranteed to be set for each successfully parsed file.
pub fn repositories() -> Result<Repositories, Error> {
let to_result = |files: Vec<APTRepositoryFile>, errors: Vec<APTRepositoryFileError>| {
let common_digest = common_digest(&files);

6
proxmox-schema/src/property_string.rs
View File

@ -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;
}