Skip to content

Commit 82684cc

Browse files
committed
Upgrade cargo_metadata to 0.23
1 parent bb0f0b9 commit 82684cc

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

cargo-auditable/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ object = {version = "0.36", default-features = false, features = ["write"]}
1717
auditable-serde = {version = "0.9.0", path = "../auditable-serde"}
1818
miniz_oxide = {version = "0.8.0"}
1919
serde_json = "1.0.57"
20-
cargo_metadata = "0.18"
20+
cargo_metadata = "0.23"
2121
pico-args = { version = "0.5", features = ["eq-separator", "short-space-opt"] }
2222
serde = "1.0.147"
2323
wasm-gen = "0.1.4"
2424

2525
[dev-dependencies]
26-
cargo_metadata = "0.18"
26+
cargo_metadata = "0.23"
2727
auditable-info = {version = "0.10.0", path = "../auditable-info", features = ["wasm"]}
2828
which = "4.3.0"

cargo-auditable/src/auditable_from_metadata.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use std::{
99
};
1010

1111
use auditable_serde::{DependencyKind, Package, Source, VersionInfo};
12+
use cargo_metadata::TargetKind;
1213

1314
fn source_from_meta(meta_source: &cargo_metadata::Source) -> Source {
1415
match meta_source.repr.as_str() {
@@ -186,7 +187,7 @@ pub fn encode_audit_data(
186187
let mut packages: Vec<Package> = packages
187188
.into_iter()
188189
.map(|p| Package {
189-
name: p.name.to_owned(),
190+
name: p.name.to_string(),
190191
version: p.version.clone(),
191192
source: p.source.as_ref().map_or(Source::Local, source_from_meta),
192193
kind: (*metadata_package_dep_kind(p).unwrap()).into(),
@@ -240,7 +241,7 @@ fn proc_macro_packages(metadata: &cargo_metadata::Metadata) -> HashSet<&str> {
240241
// Checking that length is 1 is purely to hedge against support for it being added in the future.
241242
if pkg.targets.len() == 1
242243
&& pkg.targets[0].kind.len() == 1
243-
&& pkg.targets[0].kind[0] == "proc-macro"
244+
&& pkg.targets[0].kind[0] == TargetKind::ProcMacro
244245
{
245246
Some(pkg.id.repr.as_str())
246247
} else {

cargo-auditable/tests/it.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::{
1010
use auditable_serde::{DependencyKind, VersionInfo};
1111
use cargo_metadata::{
1212
camino::{Utf8Path, Utf8PathBuf},
13-
Artifact,
13+
Artifact, TargetKind,
1414
};
1515

1616
// Path to cargo-auditable binary under test
@@ -104,7 +104,7 @@ where
104104
.target
105105
.kind
106106
.iter()
107-
.any(|kind| kind.as_str() == "cdylib")
107+
.any(|kind| *kind == TargetKind::CDyLib)
108108
{
109109
// Detect files with .so (Linux), .dylib (Mac) and .dll (Windows) extensions
110110
artifact

resolverver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ serde = { version = "1.0.217", features = ["derive"] }
1212
toml = { version = "0.8.19", default-features = false, features = ["parse"] }
1313

1414
[dev-dependencies]
15-
cargo_metadata = "0.18.1"
15+
cargo_metadata = "0.23"
1616

0 commit comments

Comments
 (0)