upgrade to Zig 0.13

nektro · nektro · commit 2c004d07b20f · 2024-09-07T16:15:49.000-07:00
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -27,7 +27,7 @@ jobs:
         uses: mlugg/setup-zig@v1
         with:
           mirror: "https://mirrors.nektro.net/s3cgi"
-          version: "0.12.0"
+          version: "0.13.0"
 
       - run: zig version
       - run: zig env
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -20,7 +20,7 @@ jobs:
         uses: mlugg/setup-zig@v1
         with:
           mirror: "https://mirrors.nektro.net/s3cgi"
-          version: "0.12.0"
+          version: "0.13.0"
 
       - run: zig version
       - run: zig env
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
-zig-*
+zig-cache
+.zig-cache
+zig-out
 .zigmod
 bin
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ A package manager for the Zig programming language.
 - https://github.com/nektro/zigmod/releases
 
 ## Built With
-- Zig master (at least `0.12.0`)
+- Zig `0.13.0`
 - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock)
 
 ### Build from Source
diff --git a/build.zig b/build.zig
@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) void {
     const exe_name = b.fmt("{s}{s}", .{ "zigmod", if (use_full_name) with_arch_os else "" });
     const exe = b.addExecutable(.{
         .name = exe_name,
-        .root_source_file = .{ .path = "src/main.zig" },
+        .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = mode,
     });
diff --git a/deps.zig b/deps.zig
@@ -40,7 +40,7 @@ pub const GitExactStep = struct {
             return result;
         }
 
-        fn make(step: *std.Build.Step, prog_node: *std.Progress.Node) !void {
+        fn make(step: *std.Build.Step, prog_node: std.Progress.Node) !void {
             _ = step;
             _ = prog_node;
         }
@@ -126,7 +126,7 @@ pub const Package = struct {
         });
         dummy_library.step.dependOn(fetch_step);
         if (self.entry) |capture| {
-            result.root_source_file = .{ .path = capture };
+            result.root_source_file = .{ .cwd_relative = capture };
         }
         for (self.deps) |item| {
             const module_dep = item.module(exe, fetch_step);
@@ -168,7 +168,7 @@ pub const Package = struct {
 };
 
 fn checkMinZig(current: std.SemanticVersion, exe: *std.Build.Step.Compile) void {
-    const min = std.SemanticVersion.parse("0.12.0") catch return;
+    const min = std.SemanticVersion.parse("0.13.0") catch return;
     if (current.order(min).compare(.lt)) @panic(exe.step.owner.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min}));
 }
 
diff --git a/docs/README.md b/docs/README.md
@@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed.
 
 As Zig is still in development itself, if you plan to contribute to Zigmod you will need a master download of Zig. Those can be obtained from https://ziglang.org/download/#release-master.
 
-The earliest Zig release this Zigmod was verified to work with is `0.12.0`.
+The earliest Zig release this Zigmod was verified to work with is `0.13.0`.
 
 ## Download
 You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source.
diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig
@@ -70,7 +70,7 @@ pub fn execute(self_name: []const u8, args: [][]u8) !void {
         "--prefix",    try std.fs.path.join(gpa, &.{ homepath, ".zigmod" }),
         "--cache-dir", try std.fs.path.join(gpa, &.{ cache.?, "zigmod", "zig" }),
     };
-    var proc = std.ChildProcess.init(argv, gpa);
+    var proc = std.process.Child.init(argv, gpa);
     proc.cwd = modpath;
     const term = try proc.spawnAndWait();
     switch (term) {
diff --git a/src/cmd/aquila/update.zig b/src/cmd/aquila/update.zig
@@ -56,7 +56,7 @@ pub fn execute(self_name: []const u8, args: [][]u8) !void {
             "--prefix",    try std.fs.path.join(gpa, &.{ homepath, ".zigmod" }),
             "--cache-dir", try std.fs.path.join(gpa, &.{ cache.?, "zigmod", "zig" }),
         };
-        var proc = std.ChildProcess.init(argv, gpa);
+        var proc = std.process.Child.init(argv, gpa);
         proc.cwd = modpath;
         const term = try proc.spawnAndWait();
         switch (term) {
diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
@@ -329,7 +329,7 @@ fn print_pkg_data_to(w: std.fs.File.Writer, notdone: *std.ArrayList(zigmod.Modul
                 });
                 if (mod.main.len > 0 and !std.mem.eql(u8, &mod.id, &zigmod.Module.ROOT)) {
                     try w.print(
-                        \\        .import = .{{ "{s}", .{{ .path = dirs._{s} ++ "/{s}" }} }},
+                        \\        .import = .{{ "{s}", .{{ .cwd_relative = dirs._{s} ++ "/{s}" }} }},
                         \\
                     , .{
                         mod.name,
diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig
@@ -83,7 +83,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
         \\            return result;
         \\        }
         \\
-        \\        fn make(step: *std.Build.Step, prog_node: *std.Progress.Node) !void {
+        \\        fn make(step: *std.Build.Step, prog_node: std.Progress.Node) !void {
         \\            _ = step;
         \\            _ = prog_node;
         \\        }
@@ -162,7 +162,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
         \\        });
         \\        dummy_library.step.dependOn(fetch_step);
         \\        if (self.entry) |capture| {
-        \\            result.root_source_file = .{ .path = capture };
+        \\            result.root_source_file = .{ .cwd_relative = capture };
         \\        }
         \\        for (self.deps) |item| {
         \\            const module_dep = item.module(exe, fetch_step);
diff --git a/src/cmd/init.zig b/src/cmd/init.zig
@@ -147,7 +147,8 @@ pub fn execute(self_name: []const u8, args: [][]u8) !void {
             if (len > 0 and (try file.reader().readByte()) != '\n') {
                 try w.writeAll("\n");
             }
-            if (!exists) try w.writeAll("zig-*\n");
+            if (!exists) try w.writeAll(".zig-cache\n");
+            if (!exists) try w.writeAll("zig-out\n");
             try w.writeAll(".zigmod\n");
             try w.writeAll("deps.zig\n");
             try w.writeAll("files.zig\n");
diff --git a/src/main.zig b/src/main.zig
@@ -56,7 +56,7 @@ pub fn main() !void {
     for (args[1..]) |item| {
         try sub_cmd_args.append(item);
     }
-    const result = std.ChildProcess.run(.{ .allocator = gpa, .argv = sub_cmd_args.items }) catch |e| switch (e) {
+    const result = std.process.Child.run(.{ .allocator = gpa, .argv = sub_cmd_args.items }) catch |e| switch (e) {
         else => |ee| return ee,
         error.FileNotFound => {
             fail("unknown command \"{s}\" for \"zigmod\"", .{args[0]});
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
@@ -53,8 +53,8 @@ pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {
     return try extras.fileList(alloc, dir);
 }
 
-pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.ChildProcess.RunResult {
-    return std.ChildProcess.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) {
+pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.process.Child.RunResult {
+    return std.process.Child.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) {
         error.FileNotFound => {
             u.fail("\"{s}\" command not found", .{args[0]});
         },
diff --git a/zig.mod b/zig.mod
@@ -3,7 +3,7 @@ name: zigmod
 main: src/lib.zig
 license: MIT
 description: A package manager for the Zig programming language.
-min_zig_version: 0.12.0
+min_zig_version: 0.13.0
 dependencies:
   - src: git https://github.com/nektro/zig-yaml
   - src: git https://github.com/nektro/zig-ansi

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 -zig-*
 +zig-cache
 +.zig-cache
 +zig-out
 .zigmod
 bin
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pub const GitExactStep = struct {`
`40`	`40`	`return result;`
`41`	`41`	`}`
`42`	`42`
`43`		`- fn make(step: std.Build.Step, prog_node: std.Progress.Node) !void {`
	`43`	`+ fn make(step: *std.Build.Step, prog_node: std.Progress.Node) !void {`
`44`	`44`	`_ = step;`
`45`	`45`	`_ = prog_node;`
`46`	`46`	`}`
`@@ -126,7 +126,7 @@ pub const Package = struct {`
`126`	`126`	`});`
`127`	`127`	`dummy_library.step.dependOn(fetch_step);`
`128`	`128`	`if (self.entry) \|capture\| {`
`129`		`- result.root_source_file = .{ .path = capture };`
	`129`	`+ result.root_source_file = .{ .cwd_relative = capture };`
`130`	`130`	`}`
`131`	`131`	`for (self.deps) \|item\| {`
`132`	`132`	`const module_dep = item.module(exe, fetch_step);`
`@@ -168,7 +168,7 @@ pub const Package = struct {`
`168`	`168`	`};`
`169`	`169`
`170`	`170`	`fn checkMinZig(current: std.SemanticVersion, exe: *std.Build.Step.Compile) void {`
`171`		`- const min = std.SemanticVersion.parse("0.12.0") catch return;`
	`171`	`+ const min = std.SemanticVersion.parse("0.13.0") catch return;`
`172`	`172`	`if (current.order(min).compare(.lt)) @panic(exe.step.owner.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min}));`
`173`	`173`	`}`
`174`	`174`