Skip to content
Open
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
55 changes: 19 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ harness = false

[dependencies]
anyhow = "1.0.98"
blake3 = { version = "=1.8.2", features = ["mmap", "rayon", "traits-preview"] }
bzip2 = "0.5"
blake3 = { version = "=1.8.5" }
bzip2 = "0.6"
digest = { version = "0.10", features = ["rand_core"] }
dirs = "6.0"
dunce = "1.0.5"
filetime = "0.2.25"
flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
fs2 = "0.4"
jsonc-parser = { version = "0.26", features = ["serde"] }
jsonc-parser = { version = "0.32", features = ["serde"] }
liblzma = { version = "0.4.4", features = ["parallel", "static"] }
rand = { version = "0.9", features = ["small_rng"] }
serde = { version = "1.0.219", features = ["derive", "rc"] }
Expand All @@ -37,14 +37,14 @@ sha2 = "0.10.6"
tar = "0.4.44"
tempfile = "3.22"
thiserror = "2.0.18"
zip = { version = "3.0.0", features = ["deflate"], default-features = false }
zip = { version = "8.0.0", features = ["deflate"], default-features = false }
zstd = { version = "0.13", features = ["experimental", "zstdmt"] }

[dev-dependencies]
anyhow = "1.0.102"
assert_matches = "1.5"
buck-resources = "1"
bzip2 = "0.5.2"
bzip2 = "0.6"
criterion = "0.5.1"
liblzma = { version = "0.4.6", features = ["parallel", "static"] }
snapbox = { version = "0.6.24", features = ["color-auto", "diff", "json", "regex"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pub fn parse_file(data: &str) -> anyhow::Result<(Value, ConfigFile)> {
anyhow::format_err!("DotSlash file must start with `{REQUIRED_HEADER}`")
})?;

let value = jsonc_parser::parse_to_serde_value(data, &Default::default())?
let value = jsonc_parser::parse_to_serde_value::<Option<serde_json::Value>>(data, &Default::default())?
.with_context(|| anyhow::format_err!("Failed to parse JSON"))?;
let config_file = ConfigFile::deserialize(&value).map_err(|err| {
if value.get("oncall").is_some() {
Expand Down
2 changes: 1 addition & 1 deletion src/download.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ fn verify_artifact(
HashAlgorithm::Blake3 => {
let mut hasher = blake3::Hasher::new();
io::copy(&mut file, &mut hasher).map(|size_in_bytes| {
let digest = format!("{:x}", hasher.finalize());
let digest = hasher.finalize().to_hex().to_string();
(size_in_bytes, digest)
})
}
Expand Down
2 changes: 1 addition & 1 deletion src/print_entry_for_url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub fn print_entry_for_url(url: &OsStr) -> anyhow::Result<()> {
let mut file = File::open(tempfile.path())?;
let mut hasher = blake3::Hasher::new();
let size = io::copy(&mut file, &mut hasher)?;
let hex_digest = format!("{:x}", hasher.finalize());
let hex_digest = hasher.finalize().to_hex().to_string();

let entry_json = serialize_entry(url, size, hex_digest)?;
println!("{}", entry_json);
Expand Down
2 changes: 1 addition & 1 deletion src/subcommand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn run_subcommand_impl(subcommand: &Subcommand, args: &mut ArgsOs) -> anyhow::Re
let mut file = fs_ctx::file_open(file_arg)?;
let mut hasher = blake3::Hasher::new();
io::copy(&mut file, &mut hasher)?;
let hex_digest = format!("{:x}", hasher.finalize());
let hex_digest = hasher.finalize().to_hex().to_string();
println!("{}", hex_digest);
}

Expand Down