Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update rust crate cargo_metadata to 0.18 #16

Merged
merged 2 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/packager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ clap = { workspace = true, optional = true }
log = { workspace = true, features = ["kv_unstable", "kv_unstable_std"] }
toml = "0.7"
env_logger = { version = "0.10", optional = true }
cargo_metadata = "0.17"
cargo_metadata = "0.18"
ureq = "2.7"
hex = "0.4"
sha1 = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion crates/packager/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl ConfigExtInternal for Config {
use relative_path::PathExt;
let src = src?;
let src = dunce::canonicalize(src)?;
let target = src.relative_to(&cwd)?;
let target = src.relative_to(cwd)?;
out.push(Resource {
src,
target: target.to_path(""),
Expand Down
4 changes: 2 additions & 2 deletions crates/packager/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ fn try_run(cli: Cli) -> Result<()> {

let mut configs = match cli.config {
// if a raw json object
Some(c) if c.starts_with("{") => vec![(None, serde_json::from_str::<Config>(&c)?)],
Some(c) if c.starts_with('{') => vec![(None, serde_json::from_str::<Config>(&c)?)],
// if a raw json array
Some(c) if c.starts_with("[") => serde_json::from_str::<Vec<Config>>(&c)?
Some(c) if c.starts_with('[') => serde_json::from_str::<Vec<Config>>(&c)?
.into_iter()
.map(|c| (None, c))
.collect(),
Expand Down
2 changes: 1 addition & 1 deletion crates/packager/src/wix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ fn generate_binaries_data(config: &Config) -> crate::Result<Vec<Binary>> {
.into_string()
.expect("failed to read binary path"),
id: regex
.replace_all(&&bin.filename.replace('-', "_"), "")
.replace_all(&bin.filename.replace('-', "_"), "")
.to_string(),
})
}
Expand Down
Loading