Merge pull request #181 from kubkon/writergate

writergate: update the codebase for latest breaking changes to std.Io.Writer interface

Author: kubkon

.github/workflows/main.yml

@@ -13,9 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: mlugg/setup-zig@v1
+    - uses: mlugg/setup-zig@v2
       with:
-        version: 0.14.0
+        version: master
     - run: zig version
     - run: zig fmt --check src 
     - run: zig build test -Dhas-zig -Dhas-objc-msgsend-stubs --summary all

README.md

@@ -44,7 +44,7 @@ tl;dr `bold` is currently directly competing with LLVM lld but behind the Apple
 
 ### Building
 
-You will need Zig 0.14.0 in your path. You can download it from [here](https://ziglang.org/download/).
+You will need nightly Zig in your path. You can download it from [here](https://ziglang.org/download/).
 
 ```
 $ zig build -Doptimize=ReleaseFast

build.zig

@@ -29,16 +29,19 @@ pub fn build(b: *std.Build) void {
         .target = target,
         .optimize = mode,
     });
-
-    const exe = b.addExecutable(.{
-        .name = "bold",
+    const main = b.addModule("bold", .{
         .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = mode,
-        .use_llvm = use_llvm,
         .sanitize_thread = sanitize_thread,
         .single_threaded = single_threaded,
     });
+
+    const exe = b.addExecutable(.{
+        .name = "bold",
+        .root_module = main,
+        .use_llvm = use_llvm,
+    });
     exe.root_module.addImport("yaml", yaml.module("yaml"));
     exe.root_module.addImport("dis_x86_64", dis_x86_64.module("dis_x86_64"));
     exe.root_module.strip = strip;
@@ -78,12 +81,8 @@ pub fn build(b: *std.Build) void {
     const is_nix = b.option(bool, "nix", "Whether the host is Nix-based") orelse false;
 
     const unit_tests = b.addTest(.{
-        .root_source_file = b.path("src/MachO.zig"),
-        .target = target,
-        .optimize = mode,
+        .root_module = main,
         .use_llvm = use_llvm,
-        .sanitize_thread = sanitize_thread,
-        .single_threaded = single_threaded,
     });
     const unit_tests_opts = b.addOptions();
     unit_tests.root_module.addOptions("build_options", unit_tests_opts);

build.zig.zon

@@ -4,12 +4,12 @@
 
     .dependencies = .{
         .@"zig-yaml" = .{
-            .url = "https://github.com/kubkon/zig-yaml/archive/refs/tags/0.1.1.tar.gz",
-            .hash = "zig_yaml-0.1.0-C1161miEAgBCwL3YAEQZwV_4GyaaT2Xqj9nKB6hNe_TL",
+            .url = "https://github.com/kubkon/zig-yaml/archive/497fca7c3bfc84807547a48f97a15faf3b302024.tar.gz",
+            .hash = "zig_yaml-0.1.0-C1161nurAgA_fBRSFEaMD7RmHuefuwtP8n99inEXTi_F",
         },
         .@"zig-dis-x86_64" = .{
-            .url = "https://github.com/kubkon/zig-dis-x86_64/archive/48c399d7f9d879f46a69d4a06af3fa0699286ba5.tar.gz",
-            .hash = "zig_dis_x86_64-0.0.1-bnhOUXf6AwDf1MpMgHZImLwqhFbUp2Fl_MoxhtPEeo4N",
+            .url = "https://github.com/kubkon/zig-dis-x86_64/archive/5c57c8b922d15d57c0addb42ca8f0eadb5776fe0.tar.gz",
+            .hash = "zig_dis_x86_64-0.0.1-bnhOUan2AwCq_1M_JlJCpTB5ve3z1xLVNNyyxLHfWg8D",
         },
     },
 

flake.lock

@@ -84,8 +84,8 @@ pub fn parse(self: *Archive, macho_file: *MachO, path: []const u8, file_handle:
         pos += @sizeOf(ar_hdr);
 
         if (!mem.eql(u8, &hdr.ar_fmag, ARFMAG)) {
-            macho_file.fatal("{s}: invalid header delimiter: expected '{s}', found '{s}'", .{
-                path, std.fmt.fmtSliceEscapeLower(ARFMAG), std.fmt.fmtSliceEscapeLower(&hdr.ar_fmag),
+            macho_file.fatal("{s}: invalid header delimiter: expected '{f}', found '{f}'", .{
+                path, std.ascii.hexEscape(ARFMAG, .lower), std.ascii.hexEscape(&hdr.ar_fmag, .lower),
             });
             return error.ParseFailed;
         }