proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-07 05:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clippy fixes

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-10-12 10:41:42 +02:00
parent 5450421f03
commit 661b8837f3
5 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/deb822/release_file.rs
View File

@ -314,39 +314,36 @@ impl TryFrom<ReleaseFileRaw> for ReleaseFile {
type Error = Error; type Error = Error;
fn try_from(value: ReleaseFileRaw) -> Result<Self, Self::Error> { fn try_from(value: ReleaseFileRaw) -> Result<Self, Self::Error> {
let mut parsed = ReleaseFile::default(); let mut parsed = ReleaseFile {
architectures: whitespace_split_to_vec(
parsed.architectures = whitespace_split_to_vec( &value
&value .architectures
.architectures .ok_or_else(|| format_err!("'Architectures' field missing."))?,
.ok_or_else(|| format_err!("'Architectures' field missing."))?, ),
); components: whitespace_split_to_vec(
parsed.components = whitespace_split_to_vec( &value
&value .components
.components .ok_or_else(|| format_err!("'Components' field missing."))?,
.ok_or_else(|| format_err!("'Components' field missing."))?, ),
); changelogs: value.changelogs,
codename: value.codename,
parsed.changelogs = value.changelogs; date: value.date.as_deref().map(parse_date),
parsed.codename = value.codename; valid_until: value
.extra_fields
parsed.date = value.date.as_deref().map(parse_date); .get("Valid-Until")
parsed.valid_until = value .map(|val| parse_date(&val.to_string())),
.extra_fields description: value.description,
.get("Valid-Until") label: value.label,
.map(|val| parse_date(&val.to_string())); origin: value.origin,
suite: value.suite,
parsed.description = value.description; files: HashMap::new(),
parsed.label = value.label; aquire_by_hash: false,
parsed.origin = value.origin; version: value.version,
parsed.suite = value.suite;
parsed.version = value.version;
parsed.aquire_by_hash = match value.extra_fields.get("Acquire-By-Hash") {
Some(val) => *val == "yes",
None => false,
}; };
if let Some(val) = value.extra_fields.get("Acquire-By-Hash") {
parsed.aquire_by_hash = *val == "yes";
}
// Fixup bullseye-security release files which have invalid components // Fixup bullseye-security release files which have invalid components
if parsed.label.as_deref() == Some("Debian-Security") if parsed.label.as_deref() == Some("Debian-Security")
&& parsed.codename.as_deref() == Some("bullseye-security") && parsed.codename.as_deref() == Some("bullseye-security")
@ -423,7 +420,7 @@ impl TryFrom<ReleaseFileRaw> for ReleaseFile {
parsed.files = parsed.files =
references_map references_map
.into_iter() .into_iter()
.fold(HashMap::new(), |mut map, (base, inner_map)| { .fold(parsed.files, |mut map, (base, inner_map)| {
map.insert(base, inner_map.into_values().collect()); map.insert(base, inner_map.into_values().collect());
map map
}); });

2
src/repositories/file/sources_parser.rs
View File

@ -186,7 +186,7 @@ impl<R: BufRead> APTRepositoryParser for APTSourcesFileParser<R> {
break; break;
} }
Ok(_) => { Ok(_) => {
if (&lines[old_length..]) if (lines[old_length..])
.trim_matches(|c| char::is_ascii_whitespace(&c)) .trim_matches(|c| char::is_ascii_whitespace(&c))
.is_empty() .is_empty()
{ {

4
src/repositories/repository.rs
View File

@ -10,7 +10,7 @@ use proxmox_schema::api;
use crate::repositories::standard::APTRepositoryHandle; use crate::repositories::standard::APTRepositoryHandle;
#[api] #[api]
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)] #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
pub enum APTRepositoryFileType { pub enum APTRepositoryFileType {
/// One-line-style format /// One-line-style format
@ -41,7 +41,7 @@ impl Display for APTRepositoryFileType {
} }
#[api] #[api]
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)] #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum APTRepositoryPackageType { pub enum APTRepositoryPackageType {
/// Debian package /// Debian package

4
src/repositories/standard.rs
View File

@ -17,7 +17,7 @@ use proxmox_schema::api;
}, },
}, },
)] )]
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
/// Reference to a standard repository and configuration status. /// Reference to a standard repository and configuration status.
pub struct APTStandardRepository { pub struct APTStandardRepository {
@ -36,7 +36,7 @@ pub struct APTStandardRepository {
} }
#[api] #[api]
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)] #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
/// Handles for Proxmox repositories. /// Handles for Proxmox repositories.
pub enum APTRepositoryHandle { pub enum APTRepositoryHandle {

18
tests/repositories.rs
View File

@ -160,7 +160,7 @@ fn test_empty_write() -> Result<(), Error> {
file.parse()?; file.parse()?;
let new_path = write_dir.join(path.file_name().unwrap()); let new_path = write_dir.join(path.file_name().unwrap());
file.path = Some(new_path.clone().into_os_string().into_string().unwrap()); file.path = Some(new_path.into_os_string().into_string().unwrap());
file.digest = None; file.digest = None;
@ -191,9 +191,9 @@ fn test_check_repositories() -> Result<(), Error> {
let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap(); let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap();
file.parse()?; file.parse()?;
let infos = check_repositories(&vec![file], DebianCodename::Bullseye); let infos = check_repositories(&[file], DebianCodename::Bullseye);
assert_eq!(infos.is_empty(), true); assert!(infos.is_empty());
let pve_list = read_dir.join("pve.list"); let pve_list = read_dir.join("pve.list");
let mut file = APTRepositoryFile::new(&pve_list)?.unwrap(); let mut file = APTRepositoryFile::new(&pve_list)?.unwrap();
file.parse()?; file.parse()?;
@ -205,18 +205,18 @@ fn test_check_repositories() -> Result<(), Error> {
]; ];
let mut expected_infos = vec![]; let mut expected_infos = vec![];
for n in 0..=5 { for (n, origin) in origins.into_iter().enumerate() {
expected_infos.push(APTRepositoryInfo { expected_infos.push(APTRepositoryInfo {
path: path_string.clone(), path: path_string.clone(),
index: n, index: n,
property: None, property: None,
kind: "origin".to_string(), kind: "origin".to_string(),
message: origins[n].to_string(), message: origin.to_string(),
}); });
} }
expected_infos.sort(); expected_infos.sort();
let mut infos = check_repositories(&vec![file], DebianCodename::Bullseye); let mut infos = check_repositories(&[file], DebianCodename::Bullseye);
infos.sort(); infos.sort();
assert_eq!(infos, expected_infos); assert_eq!(infos, expected_infos);
@ -282,7 +282,7 @@ fn test_check_repositories() -> Result<(), Error> {
} }
expected_infos.sort(); expected_infos.sort();
let mut infos = check_repositories(&vec![file], DebianCodename::Bullseye); let mut infos = check_repositories(&[file], DebianCodename::Bullseye);
infos.sort(); infos.sort();
assert_eq!(infos, expected_infos); assert_eq!(infos, expected_infos);
@ -314,7 +314,7 @@ fn test_check_repositories() -> Result<(), Error> {
} }
expected_infos.sort(); expected_infos.sort();
let mut infos = check_repositories(&vec![file], DebianCodename::Bullseye); let mut infos = check_repositories(&[file], DebianCodename::Bullseye);
infos.sort(); infos.sort();
assert_eq!(infos, expected_infos); assert_eq!(infos, expected_infos);
@ -374,7 +374,7 @@ fn test_standard_repositories() -> Result<(), Error> {
let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap(); let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap();
file.parse()?; file.parse()?;
let std_repos = standard_repositories(&vec![file], "pve", DebianCodename::Bullseye); let std_repos = standard_repositories(&[file], "pve", DebianCodename::Bullseye);
assert_eq!(std_repos, expected); assert_eq!(std_repos, expected);