authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-06-06 11:16:44-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-06-06 11:16:44-07:00
logbc3ce4b9715fc487eddfa1819a252a8fc82a369e
treeba49ed145574449e4531706874ac769a5babe511
parent8f7fc63847fd2c2334a13e5dce564942146120c7

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

we can more simply use quotes instead

1 files changed, 4 insertions(+), 6 deletions(-)

src/Package/Fetch.zig+4-6
......@@ -567,18 +567,16 @@ fn runResource(
567567 if (declared_hash.isOld()) {
568568 const actual_hex = Package.multiHashHexDigest(f.computed_hash.digest);
569569 if (!std.mem.eql(u8, declared_hash.toSlice(), &actual_hex)) {
570 const declared = if (declared_hash.toSlice().len > 0) declared_hash.toSlice() else "<empty>";
571570 return f.fail(hash_tok, try eb.printString(
572 "hash mismatch: manifest declares {s} but the fetched package has {s}",
573 .{ declared, actual_hex },
571 "hash mismatch: manifest declares '{s}' but the fetched package has '{s}'",
572 .{ declared_hash.toSlice(), actual_hex },
574573 ));
575574 }
576575 } else {
577576 if (!computed_package_hash.eql(&declared_hash)) {
578 const declared = if (declared_hash.toSlice().len > 0) declared_hash.toSlice() else "<empty>";
579577 return f.fail(hash_tok, try eb.printString(
580 "hash mismatch: manifest declares {s} but the fetched package has {s}",
581 .{ declared, computed_package_hash.toSlice() },
578 "hash mismatch: manifest declares '{s}' but the fetched package has '{s}'",
579 .{ declared_hash.toSlice(), computed_package_hash.toSlice() },
582580 ));
583581 }
584582 }