aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimon Kruiper <timonkruiper@gmail.com>2021-03-02 11:44:33 +0100
committerAndrew Kelley <andrew@ziglang.org>2021-03-02 19:02:55 -0700
commit6aa1ea9c59340a1f5b7560ecd97e45928bd4cf56 (patch)
treef038434259f44c5884350c8008c717ddc640b793 /src
parented6757ece6228f8bf43f9d8e0481f4160b9a884b (diff)
downloadzig-6aa1ea9c59340a1f5b7560ecd97e45928bd4cf56.tar.gz
zig-6aa1ea9c59340a1f5b7560ecd97e45928bd4cf56.zip
stage2: fixup some formatting errors ({x} -> {s})
These were missed in cd7c870bd81391dd97c5c75eb3910382ba7280a1
Diffstat (limited to 'src')
-rw-r--r--src/link.zig4
-rw-r--r--src/link/Coff.zig6
-rw-r--r--src/link/Elf.zig6
-rw-r--r--src/link/MachO.zig6
-rw-r--r--src/link/Wasm.zig6
5 files changed, 14 insertions, 14 deletions
diff --git a/src/link.zig b/src/link.zig
index 0a4cde0284..db3e973f84 100644
--- a/src/link.zig
+++ b/src/link.zig
@@ -550,11 +550,11 @@ pub const File = struct {
id_symlink_basename,
&prev_digest_buf,
) catch |err| b: {
- log.debug("archive new_digest={x} readFile error: {s}", .{ digest, @errorName(err) });
+ log.debug("archive new_digest={s} readFile error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
break :b prev_digest_buf[0..0];
};
if (mem.eql(u8, prev_digest, &digest)) {
- log.debug("archive digest={x} match - skipping invocation", .{digest});
+ log.debug("archive digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
base.lock = man.toOwnedLock();
return;
}
diff --git a/src/link/Coff.zig b/src/link/Coff.zig
index 2eee19b4f6..a73b8aaf9c 100644
--- a/src/link/Coff.zig
+++ b/src/link/Coff.zig
@@ -892,17 +892,17 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
id_symlink_basename,
&prev_digest_buf,
) catch |err| blk: {
- log.debug("COFF LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
+ log.debug("COFF LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
// Handle this as a cache miss.
break :blk prev_digest_buf[0..0];
};
if (mem.eql(u8, prev_digest, &digest)) {
- log.debug("COFF LLD digest={x} match - skipping invocation", .{digest});
+ log.debug("COFF LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
// Hot diggity dog! The output binary is already there.
self.base.lock = man.toOwnedLock();
return;
}
- log.debug("COFF LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
+ log.debug("COFF LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
// We are about to change the output file to be different, so we invalidate the build hash now.
directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index 1b6fbb0f0f..bfef2cd12c 100644
--- a/src/link/Elf.zig
+++ b/src/link/Elf.zig
@@ -1365,17 +1365,17 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
id_symlink_basename,
&prev_digest_buf,
) catch |err| blk: {
- log.debug("ELF LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
+ log.debug("ELF LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
// Handle this as a cache miss.
break :blk prev_digest_buf[0..0];
};
if (mem.eql(u8, prev_digest, &digest)) {
- log.debug("ELF LLD digest={x} match - skipping invocation", .{digest});
+ log.debug("ELF LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
// Hot diggity dog! The output binary is already there.
self.base.lock = man.toOwnedLock();
return;
}
- log.debug("ELF LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
+ log.debug("ELF LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
// We are about to change the output file to be different, so we invalidate the build hash now.
directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index 139a9b8940..0f76925618 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -556,17 +556,17 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
id_symlink_basename,
&prev_digest_buf,
) catch |err| blk: {
- log.debug("MachO LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
+ log.debug("MachO LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
// Handle this as a cache miss.
break :blk prev_digest_buf[0..0];
};
if (mem.eql(u8, prev_digest, &digest)) {
- log.debug("MachO LLD digest={x} match - skipping invocation", .{digest});
+ log.debug("MachO LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
// Hot diggity dog! The output binary is already there.
self.base.lock = man.toOwnedLock();
return;
}
- log.debug("MachO LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
+ log.debug("MachO LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
// We are about to change the output file to be different, so we invalidate the build hash now.
directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
index e0e10ad88d..71cb171d98 100644
--- a/src/link/Wasm.zig
+++ b/src/link/Wasm.zig
@@ -391,17 +391,17 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
id_symlink_basename,
&prev_digest_buf,
) catch |err| blk: {
- log.debug("WASM LLD new_digest={x} error: {s}", .{ digest, @errorName(err) });
+ log.debug("WASM LLD new_digest={s} error: {s}", .{ std.fmt.fmtSliceHexLower(&digest), @errorName(err) });
// Handle this as a cache miss.
break :blk prev_digest_buf[0..0];
};
if (mem.eql(u8, prev_digest, &digest)) {
- log.debug("WASM LLD digest={x} match - skipping invocation", .{digest});
+ log.debug("WASM LLD digest={s} match - skipping invocation", .{std.fmt.fmtSliceHexLower(&digest)});
// Hot diggity dog! The output binary is already there.
self.base.lock = man.toOwnedLock();
return;
}
- log.debug("WASM LLD prev_digest={x} new_digest={x}", .{ prev_digest, digest });
+ log.debug("WASM LLD prev_digest={s} new_digest={s}", .{ std.fmt.fmtSliceHexLower(prev_digest), std.fmt.fmtSliceHexLower(&digest) });
// We are about to change the output file to be different, so we invalidate the build hash now.
directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {