| author |  Timon Kruiper <timonkruiper@gmail.com> 2021-03-02 11:44:33+01:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2021-03-02 19:02:55-07:00 |
| log | 6aa1ea9c59340a1f5b7560ecd97e45928bd4cf56 |
| tree | f038434259f44c5884350c8008c717ddc640b793 |
| parent | ed6757ece6228f8bf43f9d8e0481f4160b9a884b |
stage2: fixup some formatting errors ({x} -> {s})
These were missed in cd7c870bd81391dd97c5c75eb3910382ba7280a15 files changed, 14 insertions(+), 14 deletions(-)
src/link.zig+2-2
| ... | @@ -550,11 +550,11 @@ pub const File = struct { | ... | @@ -550,11 +550,11 @@ pub const File = struct { |
| 550 | id_symlink_basename, | 550 | id_symlink_basename, |
| 551 | &prev_digest_buf, | 551 | &prev_digest_buf, |
| 552 | ) catch |err| b: { | 552 | ) 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) }); |
| 554 | break :b prev_digest_buf[0..0]; | 554 | break :b prev_digest_buf[0..0]; |
| 555 | }; | 555 | }; |
| 556 | if (mem.eql(u8, prev_digest, &digest)) { | 556 | 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)}); |
| 558 | base.lock = man.toOwnedLock(); | 558 | base.lock = man.toOwnedLock(); |
| 559 | return; | 559 | return; |
| 560 | } | 560 | } |
src/link/Coff.zig+3-3
| ... | @@ -892,17 +892,17 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void { | ... | @@ -892,17 +892,17 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void { |
| 892 | id_symlink_basename, | 892 | id_symlink_basename, |
| 893 | &prev_digest_buf, | 893 | &prev_digest_buf, |
| 894 | ) catch |err| blk: { | 894 | ) 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) }); |
| 896 | // Handle this as a cache miss. | 896 | // Handle this as a cache miss. |
| 897 | break :blk prev_digest_buf[0..0]; | 897 | break :blk prev_digest_buf[0..0]; |
| 898 | }; | 898 | }; |
| 899 | if (mem.eql(u8, prev_digest, &digest)) { | 899 | 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)}); |
| 901 | // Hot diggity dog! The output binary is already there. | 901 | // Hot diggity dog! The output binary is already there. |
| 902 | self.base.lock = man.toOwnedLock(); | 902 | self.base.lock = man.toOwnedLock(); |
| 903 | return; | 903 | return; |
| 904 | } | 904 | } |
| 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) }); |
| 906 | 906 | ||
| 907 | // We are about to change the output file to be different, so we invalidate the build hash now. | 907 | // We are about to change the output file to be different, so we invalidate the build hash now. |
| 908 | directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) { | 908 | 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 { | ... | @@ -1365,17 +1365,17 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void { |
| 1365 | id_symlink_basename, | 1365 | id_symlink_basename, |
| 1366 | &prev_digest_buf, | 1366 | &prev_digest_buf, |
| 1367 | ) catch |err| blk: { | 1367 | ) 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) }); |
| 1369 | // Handle this as a cache miss. | 1369 | // Handle this as a cache miss. |
| 1370 | break :blk prev_digest_buf[0..0]; | 1370 | break :blk prev_digest_buf[0..0]; |
| 1371 | }; | 1371 | }; |
| 1372 | if (mem.eql(u8, prev_digest, &digest)) { | 1372 | 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)}); |
| 1374 | // Hot diggity dog! The output binary is already there. | 1374 | // Hot diggity dog! The output binary is already there. |
| 1375 | self.base.lock = man.toOwnedLock(); | 1375 | self.base.lock = man.toOwnedLock(); |
| 1376 | return; | 1376 | return; |
| 1377 | } | 1377 | } |
| 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) }); |
| 1379 | 1379 | ||
| 1380 | // We are about to change the output file to be different, so we invalidate the build hash now. | 1380 | // We are about to change the output file to be different, so we invalidate the build hash now. |
| 1381 | directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) { | 1381 | 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 { | ... | @@ -556,17 +556,17 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void { |
| 556 | id_symlink_basename, | 556 | id_symlink_basename, |
| 557 | &prev_digest_buf, | 557 | &prev_digest_buf, |
| 558 | ) catch |err| blk: { | 558 | ) 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) }); |
| 560 | // Handle this as a cache miss. | 560 | // Handle this as a cache miss. |
| 561 | break :blk prev_digest_buf[0..0]; | 561 | break :blk prev_digest_buf[0..0]; |
| 562 | }; | 562 | }; |
| 563 | if (mem.eql(u8, prev_digest, &digest)) { | 563 | 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)}); |
| 565 | // Hot diggity dog! The output binary is already there. | 565 | // Hot diggity dog! The output binary is already there. |
| 566 | self.base.lock = man.toOwnedLock(); | 566 | self.base.lock = man.toOwnedLock(); |
| 567 | return; | 567 | return; |
| 568 | } | 568 | } |
| 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) }); |
| 570 | 570 | ||
| 571 | // We are about to change the output file to be different, so we invalidate the build hash now. | 571 | // We are about to change the output file to be different, so we invalidate the build hash now. |
| 572 | directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) { | 572 | 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 { | ... | @@ -391,17 +391,17 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void { |
| 391 | id_symlink_basename, | 391 | id_symlink_basename, |
| 392 | &prev_digest_buf, | 392 | &prev_digest_buf, |
| 393 | ) catch |err| blk: { | 393 | ) 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) }); |
| 395 | // Handle this as a cache miss. | 395 | // Handle this as a cache miss. |
| 396 | break :blk prev_digest_buf[0..0]; | 396 | break :blk prev_digest_buf[0..0]; |
| 397 | }; | 397 | }; |
| 398 | if (mem.eql(u8, prev_digest, &digest)) { | 398 | 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)}); |
| 400 | // Hot diggity dog! The output binary is already there. | 400 | // Hot diggity dog! The output binary is already there. |
| 401 | self.base.lock = man.toOwnedLock(); | 401 | self.base.lock = man.toOwnedLock(); |
| 402 | return; | 402 | return; |
| 403 | } | 403 | } |
| 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) }); |
| 405 | 405 | ||
| 406 | // We are about to change the output file to be different, so we invalidate the build hash now. | 406 | // We are about to change the output file to be different, so we invalidate the build hash now. |
| 407 | directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) { | 407 | directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) { |