authorgravatar for timonkruiper@gmail.comTimon Kruiper <timonkruiper@gmail.com> 2021-03-02 11:44:33+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-03-02 19:02:55-07:00
log6aa1ea9c59340a1f5b7560ecd97e45928bd4cf56
treef038434259f44c5884350c8008c717ddc640b793
parented6757ece6228f8bf43f9d8e0481f4160b9a884b

stage2: fixup some formatting errors ({x} -> {s})

These were missed in cd7c870bd81391dd97c5c75eb3910382ba7280a1

5 files changed, 14 insertions(+), 14 deletions(-)

src/link.zig+2-2
......@@ -550,11 +550,11 @@ pub const File = struct {
550550 id_symlink_basename,
551551 &prev_digest_buf,
552552 ) catch |err| b: {
553 log.debug("archive new_digest={x} readFile error: {s}", .{ digest, @errorName(err) });
553 log.debug("archive new_digest={s} readFile error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
554554 break :b prev_digest_buf[0..0];
555555 };
556556 if (mem.eql(u8, prev_digest, &digest)) {
557 log.debug("archive digest={x} match - skipping invocation", .{digest});
557 log.debug("archive digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
558558 base.lock = man.toOwnedLock();
559559 return;
560560 }
src/link/Coff.zig+3-3
......@@ -892,17 +892,17 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
892892 id_symlink_basename,
893893 &prev_digest_buf,
894894 ) catch |err| blk: {
895 log.debug("COFF LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
895 log.debug("COFF LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
896896 // Handle this as a cache miss.
897897 break :blk prev_digest_buf[0..0];
898898 };
899899 if (mem.eql(u8, prev_digest, &digest)) {
900 log.debug("COFF LLD digest={x} match - skipping invocation", .{digest});
900 log.debug("COFF LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
901901 // Hot diggity dog! The output binary is already there.
902902 self.base.lock = man.toOwnedLock();
903903 return;
904904 }
905 log.debug("COFF LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
905 log.debug("COFF LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
906906
907907 // We are about to change the output file to be different, so we invalidate the build hash now.
908908 directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
src/link/Elf.zig+3-3
......@@ -1365,17 +1365,17 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
13651365 id_symlink_basename,
13661366 &prev_digest_buf,
13671367 ) catch |err| blk: {
1368 log.debug("ELF LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
1368 log.debug("ELF LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
13691369 // Handle this as a cache miss.
13701370 break :blk prev_digest_buf[0..0];
13711371 };
13721372 if (mem.eql(u8, prev_digest, &digest)) {
1373 log.debug("ELF LLD digest={x} match - skipping invocation", .{digest});
1373 log.debug("ELF LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
13741374 // Hot diggity dog! The output binary is already there.
13751375 self.base.lock = man.toOwnedLock();
13761376 return;
13771377 }
1378 log.debug("ELF LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
1378 log.debug("ELF LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
13791379
13801380 // We are about to change the output file to be different, so we invalidate the build hash now.
13811381 directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
src/link/MachO.zig+3-3
......@@ -556,17 +556,17 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
556556 id_symlink_basename,
557557 &prev_digest_buf,
558558 ) catch |err| blk: {
559 log.debug("MachO LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
559 log.debug("MachO LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
560560 // Handle this as a cache miss.
561561 break :blk prev_digest_buf[0..0];
562562 };
563563 if (mem.eql(u8, prev_digest, &digest)) {
564 log.debug("MachO LLD digest={x} match - skipping invocation", .{digest});
564 log.debug("MachO LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
565565 // Hot diggity dog! The output binary is already there.
566566 self.base.lock = man.toOwnedLock();
567567 return;
568568 }
569 log.debug("MachO LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
569 log.debug("MachO LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
570570
571571 // We are about to change the output file to be different, so we invalidate the build hash now.
572572 directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
src/link/Wasm.zig+3-3
......@@ -391,17 +391,17 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
391391 id_symlink_basename,
392392 &prev_digest_buf,
393393 ) catch |err| blk: {
394 log.debug("WASM LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
394 log.debug("WASM LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
395395 // Handle this as a cache miss.
396396 break :blk prev_digest_buf[0..0];
397397 };
398398 if (mem.eql(u8, prev_digest, &digest)) {
399 log.debug("WASM LLD digest={x} match - skipping invocation", .{digest});
399 log.debug("WASM LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
400400 // Hot diggity dog! The output binary is already there.
401401 self.base.lock = man.toOwnedLock();
402402 return;
403403 }
404 log.debug("WASM LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
404 log.debug("WASM LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
405405
406406 // We are about to change the output file to be different, so we invalidate the build hash now.
407407 directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {