Remove clone calls

Signed-off-by: Sebastian Ziebell <[email protected]>

Author: justahero

cargo-cyclonedx/src/cli.rs

@@ -168,8 +168,8 @@ impl Args {
             accept_named: HashSet::from_iter(self.license_accept_named.clone()),
         });
 
-        let describe = self.describe.clone();
-        let spec_version = self.spec_version.clone();
+        let describe = self.describe;
+        let spec_version = self.spec_version;
 
         Ok(SbomConfig {
             format: self.format,

cargo-cyclonedx/src/config.rs

@@ -55,11 +55,8 @@ impl SbomConfig {
                 .clone()
                 .map(|other| self.license_parser.clone().unwrap_or_default().merge(other))
                 .or_else(|| self.license_parser.clone()),
-            describe: other.describe.clone().or_else(|| self.describe.clone()),
-            spec_version: other
-                .spec_version
-                .clone()
-                .or_else(|| self.spec_version.clone()),
+            describe: other.describe.or(self.describe),
+            spec_version: other.spec_version.or(self.spec_version),
         }
     }
 

cargo-cyclonedx/src/generator.rs

@@ -798,7 +798,7 @@ impl GeneratedSbom {
 
     fn filename(&self, binary_name: Option<&str>, target_kind: &[String]) -> String {
         let output_options = self.sbom_config.output_options();
-        let describe = self.sbom_config.describe.clone().unwrap_or_default();
+        let describe = self.sbom_config.describe.unwrap_or_default();
 
         let mut prefix = match describe {
             Describe::Crate => self.package_name.clone(),