clippy fixes

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/deb822/release_file.rs b/src/deb822/release_file.rs
index 355b2461d2220338313240f2e66e8608ec5220da..75407f065c000ea7bba7054fca43813a3ee2937f 100644 (file)
--- a/src/deb822/release_file.rs
+++ b/src/deb822/release_file.rs
@@ -314,39 +314,36 @@ impl TryFrom<ReleaseFileRaw> for ReleaseFile {
     type Error = Error;
 
     fn try_from(value: ReleaseFileRaw) -> Result<Self, Self::Error> {
-        let mut parsed = ReleaseFile::default();
-
-        parsed.architectures = whitespace_split_to_vec(
-            &value
-                .architectures
-                .ok_or_else(|| format_err!("'Architectures' field missing."))?,
-        );
-        parsed.components = whitespace_split_to_vec(
-            &value
-                .components
-                .ok_or_else(|| format_err!("'Components' field missing."))?,
-        );
-
-        parsed.changelogs = value.changelogs;
-        parsed.codename = value.codename;
-
-        parsed.date = value.date.as_deref().map(parse_date);
-        parsed.valid_until = value
-            .extra_fields
-            .get("Valid-Until")
-            .map(|val| parse_date(&val.to_string()));
-
-        parsed.description = value.description;
-        parsed.label = value.label;
-        parsed.origin = value.origin;
-        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,
+        let mut parsed = ReleaseFile {
+            architectures: whitespace_split_to_vec(
+                &value
+                    .architectures
+                    .ok_or_else(|| format_err!("'Architectures' field missing."))?,
+            ),
+            components: whitespace_split_to_vec(
+                &value
+                    .components
+                    .ok_or_else(|| format_err!("'Components' field missing."))?,
+            ),
+            changelogs: value.changelogs,
+            codename: value.codename,
+            date: value.date.as_deref().map(parse_date),
+            valid_until: value
+                .extra_fields
+                .get("Valid-Until")
+                .map(|val| parse_date(&val.to_string())),
+            description: value.description,
+            label: value.label,
+            origin: value.origin,
+            suite: value.suite,
+            files: HashMap::new(),
+            aquire_by_hash: false,
+            version: value.version,
         };
 
+        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
         if parsed.label.as_deref() == Some("Debian-Security")
             && parsed.codename.as_deref() == Some("bullseye-security")
@@ -423,7 +420,7 @@ impl TryFrom<ReleaseFileRaw> for ReleaseFile {
         parsed.files =
             references_map
                 .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
                 });

diff --git a/src/repositories/file/sources_parser.rs b/src/repositories/file/sources_parser.rs
index dc9170d85ce61f5f1b547d3ca3b29b044babb45f..9424bbe20e6136f85a6d32d5db716691d88e4ae2 100644 (file)
--- a/src/repositories/file/sources_parser.rs
+++ b/src/repositories/file/sources_parser.rs
@@ -186,7 +186,7 @@ impl<R: BufRead> APTRepositoryParser for APTSourcesFileParser<R> {
                     break;
                 }
                 Ok(_) => {
-                    if (&lines[old_length..])
+                    if (lines[old_length..])
                         .trim_matches(|c| char::is_ascii_whitespace(&c))
                         .is_empty()
                     {

diff --git a/src/repositories/repository.rs b/src/repositories/repository.rs
index 4c87f11b75942c566d2f6b036b21e1265636ec35..a5e3015f5d3db547c9f9a81837257a64efd037b7 100644 (file)
--- a/src/repositories/repository.rs
+++ b/src/repositories/repository.rs
@@ -10,7 +10,7 @@ use proxmox_schema::api;
 use crate::repositories::standard::APTRepositoryHandle;
 
 #[api]
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 pub enum APTRepositoryFileType {
     /// One-line-style format
@@ -41,7 +41,7 @@ impl Display for APTRepositoryFileType {
 }
 
 #[api]
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 pub enum APTRepositoryPackageType {
     /// Debian package

diff --git a/src/repositories/standard.rs b/src/repositories/standard.rs
index 17cfa8d2b6567a28811c83a13a7d06e9b86d1f92..5af3117cedea9567426f1d40da4e407f576dd695 100644 (file)
--- a/src/repositories/standard.rs
+++ b/src/repositories/standard.rs
@@ -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")]
 /// Reference to a standard repository and configuration status.
 pub struct APTStandardRepository {
@@ -36,7 +36,7 @@ pub struct APTStandardRepository {
 }
 
 #[api]
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 /// Handles for Proxmox repositories.
 pub enum APTRepositoryHandle {

diff --git a/tests/repositories.rs b/tests/repositories.rs
index fd94e0d63640540f79d3b27bbe3738b3cdcc5786..f6dc2902d9799211032ed44f80891b90c6004f6b 100644 (file)
--- a/tests/repositories.rs
+++ b/tests/repositories.rs
@@ -160,7 +160,7 @@ fn test_empty_write() -> Result<(), Error> {
     file.parse()?;
 
     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;
 
@@ -191,9 +191,9 @@ fn test_check_repositories() -> Result<(), Error> {
     let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap();
     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 mut file = APTRepositoryFile::new(&pve_list)?.unwrap();
     file.parse()?;
@@ -205,18 +205,18 @@ fn test_check_repositories() -> Result<(), Error> {
     ];
 
     let mut expected_infos = vec![];
-    for n in 0..=5 {
+    for (n, origin) in origins.into_iter().enumerate() {
         expected_infos.push(APTRepositoryInfo {
             path: path_string.clone(),
             index: n,
             property: None,
             kind: "origin".to_string(),
-            message: origins[n].to_string(),
+            message: origin.to_string(),
         });
     }
     expected_infos.sort();
 
-    let mut infos = check_repositories(&vec![file], DebianCodename::Bullseye);
+    let mut infos = check_repositories(&[file], DebianCodename::Bullseye);
     infos.sort();
 
     assert_eq!(infos, expected_infos);
@@ -282,7 +282,7 @@ fn test_check_repositories() -> Result<(), Error> {
     }
     expected_infos.sort();
 
-    let mut infos = check_repositories(&vec![file], DebianCodename::Bullseye);
+    let mut infos = check_repositories(&[file], DebianCodename::Bullseye);
     infos.sort();
 
     assert_eq!(infos, expected_infos);
@@ -314,7 +314,7 @@ fn test_check_repositories() -> Result<(), Error> {
     }
     expected_infos.sort();
 
-    let mut infos = check_repositories(&vec![file], DebianCodename::Bullseye);
+    let mut infos = check_repositories(&[file], DebianCodename::Bullseye);
     infos.sort();
 
     assert_eq!(infos, expected_infos);
@@ -374,7 +374,7 @@ fn test_standard_repositories() -> Result<(), Error> {
     let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap();
     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);