Skip to content

Commit bc3ce4b

Browse files
committed
hash mismatch error: don't make empty such a special case
we can more simply use quotes instead
1 parent 8f7fc63 commit bc3ce4b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/Package/Fetch.zig

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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
}

0 commit comments

Comments
 (0)