Skip to content

Commit 39f9910

Browse files
committed
Fix clippy warnings
Signed-off-by: Sebastian Ziebell <[email protected]>
1 parent c570179 commit 39f9910

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

cargo-cyclonedx/src/cli.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ impl Args {
168168
accept_named: HashSet::from_iter(self.license_accept_named.clone()),
169169
});
170170

171-
let describe = self.describe.clone();
172-
let spec_version = self.spec_version.clone();
171+
let describe = self.describe;
172+
let spec_version = self.spec_version;
173173

174174
Ok(SbomConfig {
175175
format: self.format,

cargo-cyclonedx/src/config.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@ impl SbomConfig {
5555
.clone()
5656
.map(|other| self.license_parser.clone().unwrap_or_default().merge(other))
5757
.or_else(|| self.license_parser.clone()),
58-
describe: other.describe.clone().or_else(|| self.describe.clone()),
59-
spec_version: other
60-
.spec_version
61-
.clone()
62-
.or_else(|| self.spec_version.clone()),
58+
describe: other.describe.or(self.describe),
59+
spec_version: other.spec_version.or(self.spec_version),
6360
}
6461
}
6562

cargo-cyclonedx/src/generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ impl GeneratedSbom {
796796

797797
fn filename(&self, binary_name: Option<&str>, target_kind: &[String]) -> String {
798798
let output_options = self.sbom_config.output_options();
799-
let describe = self.sbom_config.describe.clone().unwrap_or_default();
799+
let describe = self.sbom_config.describe.unwrap_or_default();
800800

801801
let mut prefix = match describe {
802802
Describe::Crate => self.package_name.clone(),

0 commit comments

Comments
 (0)