Skip to content

Commit

Permalink
Cargo: Fix the package type to be "Crate"
Browse files Browse the repository at this point in the history 
Note that there is currently some discussion pending whether PURL should
also use "crate" instead of "cargo" as the package type [1], but until
that is the case we need to map "crate" to "cargo" for PURLs.

[1] package-url/purl-spec#75 (comment)

Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
@sschuberth @mnonnenmacher
sschuberth authored and mnonnenmacher committed Dec 18, 2020
1 parent dad457b commit 5dea2dd
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 77 deletions.
122 changes: 61 additions & 61 deletions analyzer/src/funTest/assets/projects/synthetic/cargo-expected-output.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,110 +20,110 @@ project:
scopes:
- name: "build-dependencies"
dependencies:
- id: "Cargo::spin:0.5.0"
- id: "Crate::spin:0.5.0"
linkage: "STATIC"
- name: "dependencies"
dependencies:
- id: "Cargo::cfg-if:0.1.9"
- id: "Crate::cfg-if:0.1.9"
linkage: "STATIC"
- name: "dev-dependencies"
dependencies:
- id: "Cargo::rand:0.6.5"
- id: "Crate::rand:0.6.5"
linkage: "STATIC"
dependencies:
- id: "Cargo::libc:0.2.62"
- id: "Crate::libc:0.2.62"
linkage: "STATIC"
- id: "Cargo::rand_chacha:0.1.1"
- id: "Crate::rand_chacha:0.1.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.3.1"
- id: "Crate::rand_core:0.3.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::rand_hc:0.1.0"
- id: "Crate::rand_hc:0.1.0"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.3.1"
- id: "Crate::rand_core:0.3.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::rand_isaac:0.1.1"
- id: "Crate::rand_isaac:0.1.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.3.1"
- id: "Crate::rand_core:0.3.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::rand_jitter:0.1.4"
- id: "Crate::rand_jitter:0.1.4"
linkage: "STATIC"
dependencies:
- id: "Cargo::libc:0.2.62"
- id: "Crate::libc:0.2.62"
linkage: "STATIC"
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::winapi:0.3.8"
- id: "Crate::winapi:0.3.8"
linkage: "STATIC"
dependencies:
- id: "Cargo::winapi-i686-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-i686-pc-windows-gnu:0.4.0"
linkage: "STATIC"
- id: "Cargo::winapi-x86_64-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-x86_64-pc-windows-gnu:0.4.0"
linkage: "STATIC"
- id: "Cargo::rand_os:0.1.3"
- id: "Crate::rand_os:0.1.3"
linkage: "STATIC"
dependencies:
- id: "Cargo::cloudabi:0.0.3"
- id: "Crate::cloudabi:0.0.3"
linkage: "STATIC"
dependencies:
- id: "Cargo::bitflags:1.1.0"
- id: "Crate::bitflags:1.1.0"
linkage: "STATIC"
- id: "Cargo::fuchsia-cprng:0.1.1"
- id: "Crate::fuchsia-cprng:0.1.1"
linkage: "STATIC"
- id: "Cargo::libc:0.2.62"
- id: "Crate::libc:0.2.62"
linkage: "STATIC"
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::rdrand:0.4.0"
- id: "Crate::rdrand:0.4.0"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.3.1"
- id: "Crate::rand_core:0.3.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::winapi:0.3.8"
- id: "Crate::winapi:0.3.8"
linkage: "STATIC"
dependencies:
- id: "Cargo::winapi-i686-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-i686-pc-windows-gnu:0.4.0"
linkage: "STATIC"
- id: "Cargo::winapi-x86_64-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-x86_64-pc-windows-gnu:0.4.0"
linkage: "STATIC"
- id: "Cargo::rand_pcg:0.1.2"
- id: "Crate::rand_pcg:0.1.2"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::rand_xorshift:0.1.1"
- id: "Crate::rand_xorshift:0.1.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.3.1"
- id: "Crate::rand_core:0.3.1"
linkage: "STATIC"
dependencies:
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
linkage: "STATIC"
- id: "Cargo::winapi:0.3.8"
- id: "Crate::winapi:0.3.8"
linkage: "STATIC"
dependencies:
- id: "Cargo::winapi-i686-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-i686-pc-windows-gnu:0.4.0"
linkage: "STATIC"
- id: "Cargo::winapi-x86_64-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-x86_64-pc-windows-gnu:0.4.0"
linkage: "STATIC"
packages:
- id: "Cargo::autocfg:0.1.6"
- id: "Crate::autocfg:0.1.6"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "Apache-2.0 OR MIT"
Expand Down Expand Up @@ -151,7 +151,7 @@ packages:
url: "https://github.com/cuviper/autocfg.git"
revision: ""
path: ""
- id: "Cargo::bitflags:1.1.0"
- id: "Crate::bitflags:1.1.0"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -179,7 +179,7 @@ packages:
url: "https://github.com/bitflags/bitflags.git"
revision: ""
path: ""
- id: "Cargo::cfg-if:0.1.9"
- id: "Crate::cfg-if:0.1.9"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -209,7 +209,7 @@ packages:
url: "https://github.com/alexcrichton/cfg-if.git"
revision: ""
path: ""
- id: "Cargo::cloudabi:0.0.3"
- id: "Crate::cloudabi:0.0.3"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "BSD-2-Clause"
Expand Down Expand Up @@ -238,7 +238,7 @@ packages:
url: "https://github.com/nuxinl/cloudabi.git"
revision: ""
path: ""
- id: "Cargo::fuchsia-cprng:0.1.1"
- id: "Crate::fuchsia-cprng:0.1.1"
purl: "pkg:cargo/[email protected]"
declared_licenses: []
declared_licenses_processed: {}
Expand All @@ -265,7 +265,7 @@ packages:
url: "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng"
revision: ""
path: ""
- id: "Cargo::libc:0.2.62"
- id: "Crate::libc:0.2.62"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -293,7 +293,7 @@ packages:
url: "https://github.com/rust-lang/libc.git"
revision: ""
path: ""
- id: "Cargo::rand:0.6.5"
- id: "Crate::rand:0.6.5"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -321,7 +321,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_chacha:0.1.1"
- id: "Crate::rand_chacha:0.1.1"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -349,7 +349,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_core:0.3.1"
- id: "Crate::rand_core:0.3.1"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -377,7 +377,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_core:0.4.2"
- id: "Crate::rand_core:0.4.2"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -405,7 +405,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_hc:0.1.0"
- id: "Crate::rand_hc:0.1.0"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -433,7 +433,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_isaac:0.1.1"
- id: "Crate::rand_isaac:0.1.1"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -461,7 +461,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_jitter:0.1.4"
- id: "Crate::rand_jitter:0.1.4"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -489,7 +489,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_os:0.1.3"
- id: "Crate::rand_os:0.1.3"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -517,7 +517,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_pcg:0.1.2"
- id: "Crate::rand_pcg:0.1.2"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -545,7 +545,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rand_xorshift:0.1.1"
- id: "Crate::rand_xorshift:0.1.1"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -573,7 +573,7 @@ packages:
url: "https://github.com/rust-random/rand.git"
revision: ""
path: ""
- id: "Cargo::rdrand:0.4.0"
- id: "Crate::rdrand:0.4.0"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "ISC"
Expand Down Expand Up @@ -602,7 +602,7 @@ packages:
url: "https://github.com/nagisa/rust_rdrand.git"
revision: ""
path: ""
- id: "Cargo::spin:0.5.0"
- id: "Crate::spin:0.5.0"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT"
Expand Down Expand Up @@ -631,7 +631,7 @@ packages:
url: "https://github.com/mvdnes/spin-rs.git"
revision: ""
path: ""
- id: "Cargo::winapi-i686-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-i686-pc-windows-gnu:0.4.0"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -660,7 +660,7 @@ packages:
url: "https://github.com/retep998/winapi-rs.git"
revision: ""
path: ""
- id: "Cargo::winapi-x86_64-pc-windows-gnu:0.4.0"
- id: "Crate::winapi-x86_64-pc-windows-gnu:0.4.0"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down Expand Up @@ -689,7 +689,7 @@ packages:
url: "https://github.com/retep998/winapi-rs.git"
revision: ""
path: ""
- id: "Cargo::winapi:0.3.8"
- id: "Crate::winapi:0.3.8"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down
6 changes: 3 additions & 3 deletions analyzer/src/funTest/assets/projects/synthetic/cargo-subcrate-client-expected-output.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ project:
scopes:
- name: "dependencies"
dependencies:
- id: "Cargo::lib:0.1.0"
- id: "Crate::lib:0.1.0"
linkage: "PROJECT_STATIC"
dependencies:
- id: "Cargo::cfg-if:0.1.9"
- id: "Crate::cfg-if:0.1.9"
linkage: "STATIC"
packages:
- id: "Cargo::cfg-if:0.1.9"
- id: "Crate::cfg-if:0.1.9"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions ...yzer/src/funTest/assets/projects/synthetic/cargo-subcrate-integration-expected-output.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ project:
scopes:
- name: "dependencies"
dependencies:
- id: "Cargo::spin:0.4.10"
- id: "Crate::spin:0.4.10"
linkage: "STATIC"
packages:
- id: "Cargo::spin:0.4.10"
- id: "Crate::spin:0.4.10"
purl: "pkg:cargo/[email protected]"
declared_licenses:
- "MIT"
Expand Down
Loading

0 comments on commit 5dea2dd

Please sign in to comment.