Skip to content

Commit 945319b

Browse files
committed
deduplicate tool
Signed-off-by: Christian Poveda <[email protected]>
1 parent fc93961 commit 945319b

File tree

7 files changed

+9
-302
lines changed

7 files changed

+9
-302
lines changed

cyclonedx-bom/src/specs/common/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ pub(crate) mod dependency;
44
pub(crate) mod hash;
55
pub(crate) mod organization;
66
pub(crate) mod property;
7+
pub(crate) mod tool;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: cyclonedx-bom/src/specs/v1_4/tool.rs
2+
source: cyclonedx-bom/src/specs/common/tool.rs
33
expression: xml_output
44
---
55
<?xml version="1.0" encoding="utf-8"?>

cyclonedx-bom/src/specs/v1_3/tool.rs renamed to cyclonedx-bom/src/specs/common/tool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use crate::{
2020
errors::XmlReadError,
2121
external_models::normalized_string::NormalizedString,
22-
specs::v1_3::hash::Hashes,
22+
specs::common::hash::Hashes,
2323
utilities::convert_vec,
2424
xml::{
2525
read_lax_validation_tag, read_list_tag, read_simple_tag, to_xml_read_error,

cyclonedx-bom/src/specs/v1_3/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub(crate) mod external_reference;
2323
pub(crate) mod license;
2424
pub(crate) mod metadata;
2525
pub(crate) mod service;
26-
pub(crate) mod tool;
2726

28-
pub(crate) use super::common::{attached_text, code, dependency, hash, organization, property};
27+
pub(crate) use super::common::{
28+
attached_text, code, dependency, hash, organization, property, tool,
29+
};

cyclonedx-bom/src/specs/v1_3/snapshots/cyclonedx_bom__specs__v1_3__tool__test__it_should_write_xml_full.snap

Lines changed: 0 additions & 17 deletions
This file was deleted.

cyclonedx-bom/src/specs/v1_4/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ pub(crate) mod license;
2525
pub(crate) mod metadata;
2626
pub(crate) mod service;
2727
pub(crate) mod signature;
28-
pub(crate) mod tool;
2928
pub(crate) mod vulnerability;
3029
pub(crate) mod vulnerability_analysis;
3130
pub(crate) mod vulnerability_credits;
@@ -34,4 +33,6 @@ pub(crate) mod vulnerability_reference;
3433
pub(crate) mod vulnerability_source;
3534
pub(crate) mod vulnerability_target;
3635

37-
pub(crate) use super::common::{attached_text, code, dependency, hash, organization, property};
36+
pub(crate) use super::common::{
37+
attached_text, code, dependency, hash, organization, property, tool,
38+
};

cyclonedx-bom/src/specs/v1_4/tool.rs

Lines changed: 0 additions & 279 deletions
This file was deleted.

0 commit comments

Comments
 (0)