mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-07 22:34:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hash mismatch error: don't make empty such a special case

Browse source 
we can more simply use quotes instead
This commit is contained in:
Andrew Kelley 2025-06-06 11:16:44 -07:00
parent 8f7fc63847
commit bc3ce4b971
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Package/Fetch.zig
View file

@ -567,18 +567,16 @@ fn runResource(
if (declared_hash.isOld()) { if (declared_hash.isOld()) {
const actual_hex = Package.multiHashHexDigest(f.computed_hash.digest); const actual_hex = Package.multiHashHexDigest(f.computed_hash.digest);
if (!std.mem.eql(u8, declared_hash.toSlice(), &actual_hex)) { if (!std.mem.eql(u8, declared_hash.toSlice(), &actual_hex)) {
const declared = if (declared_hash.toSlice().len > 0) declared_hash.toSlice() else "<empty>";
return f.fail(hash_tok, try eb.printString( return f.fail(hash_tok, try eb.printString(
"hash mismatch: manifest declares {s} but the fetched package has {s}", "hash mismatch: manifest declares '{s}' but the fetched package has '{s}'",
.{ declared, actual_hex }, .{ declared_hash.toSlice(), actual_hex },
)); ));
} }
} else { } else {
if (!computed_package_hash.eql(&declared_hash)) { if (!computed_package_hash.eql(&declared_hash)) {
const declared = if (declared_hash.toSlice().len > 0) declared_hash.toSlice() else "<empty>";
return f.fail(hash_tok, try eb.printString( return f.fail(hash_tok, try eb.printString(
"hash mismatch: manifest declares {s} but the fetched package has {s}", "hash mismatch: manifest declares '{s}' but the fetched package has '{s}'",
.{ declared, computed_package_hash.toSlice() }, .{ declared_hash.toSlice(), computed_package_hash.toSlice() },
)); ));
} }
} }