From a04f945d3693938fc663e45b59397b586f8592f0 Mon Sep 17 00:00:00 2001 From: prasefia Date: Tue, 6 Jan 2026 02:55:10 +0300 Subject: [PATCH] fix build errors in new Zig compiler --- build.zig | 12 ++++++------ test/tests.zig | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.zig b/build.zig index 1b27264..4bbf9a0 100644 --- a/build.zig +++ b/build.zig @@ -5,7 +5,7 @@ const tests = @import("test/tests.zig"); const Build = std.Build; const CompileStep = Build.CompileStep; const Step = Build.Step; -const Child = std.process.Child; +const Process = std.process; const assert = std.debug.assert; const join = std.fs.path.join; @@ -395,7 +395,7 @@ const ZiglingStep = struct { // Allow up to 1 MB of stdout capture. const max_output_bytes = 1 * 1024 * 1024; - const result = Child.run(b.allocator, io, .{ + const result = Process.run(b.allocator, io, .{ .argv = &.{exe_path}, .cwd = b.build_root.path.?, .cwd_dir = b.build_root.handle, @@ -412,13 +412,13 @@ const ZiglingStep = struct { } } - fn check_output(self: *ZiglingStep, result: Child.RunResult) !void { + fn check_output(self: *ZiglingStep, result: Process.RunResult) !void { const b = self.step.owner; const io = b.graph.io; // Make sure it exited cleanly. switch (result.term) { - .Exited => |code| { + .exited => |code| { if (code != 0) { return self.step.fail("{s} exited with error code {d} (expected {})", .{ self.exercise.main_file, code, 0, @@ -475,9 +475,9 @@ const ZiglingStep = struct { print("{s}PASSED:\n{s}{s}\n\n", .{ green_text, output, reset_text }); } - fn check_test(self: *ZiglingStep, result: Child.RunResult) !void { + fn check_test(self: *ZiglingStep, result: Process.RunResult) !void { switch (result.term) { - .Exited => |code| { + .exited => |code| { if (code != 0) { // The test failed. const stderr = std.mem.trimEnd(u8, result.stderr, " \r\n"); diff --git a/test/tests.zig b/test/tests.zig index 36fabfa..5e84ef7 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -6,7 +6,7 @@ const fmt = std.fmt; const mem = std.mem; const Allocator = std.mem.Allocator; -const Child = std.process.Child; +const Process = std.process; const Build = std.Build; const Step = Build.Step; const RunStep = Build.RunStep; @@ -396,8 +396,7 @@ fn heal(allocator: Allocator, exercises: []const Exercise, work_path: []const u8 const argv = &.{ "patch", "-i", patch, "-o", output, "-s", file }; - var child = Child.init(argv, allocator); - _ = try child.spawnAndWait(io); + _ = try Process.run(allocator, io, .{ .argv = argv }); } }