From f06c1f27d13b3ec380049ef58e5e8eee566172ac Mon Sep 17 00:00:00 2001 From: kamidev <1655+kamidev@users.noreply.github.com> Date: Sun, 31 Mar 2024 14:55:32 +0200 Subject: [PATCH] Fix breaking zig change to @fieldParentPtr parameters See https://github.com/ziglang/zig/pull/19470 --- build.zig | 5 ++--- test/tests.zig | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.zig b/build.zig index 3c3d414..1a49a53 100644 --- a/build.zig +++ b/build.zig @@ -247,7 +247,7 @@ const ZiglingStep = struct { fn make(step: *Step, prog_node: *std.Progress.Node) !void { // NOTE: Using exit code 2 will prevent the Zig compiler to print the message: // "error: the following build command failed with exit code 1:..." - const self = @fieldParentPtr(ZiglingStep, "step", step); + const self: *ZiglingStep = @alignCast(@fieldParentPtr("step", step)); if (self.exercise.skip) { print("Skipping {s}\n\n", .{self.exercise.main_file}); @@ -495,8 +495,7 @@ const PrintStep = struct { } fn make(step: *Step, _: *std.Progress.Node) !void { - const self = @fieldParentPtr(PrintStep, "step", step); - + const self: *PrintStep = @alignCast(@fieldParentPtr("step", step)); print("{s}", .{self.message}); } }; diff --git a/test/tests.zig b/test/tests.zig index 9ab15b3..5ee5365 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -152,7 +152,7 @@ const CheckNamedStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(CheckNamedStep, "step", step); + const self: *CheckNamedStep = @alignCast(@fieldParentPtr("step", step)); const ex = self.exercise; const stderr_file = try fs.cwd().openFile( @@ -204,7 +204,7 @@ const CheckStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(CheckStep, "step", step); + const self: *CheckStep = @alignCast(@fieldParentPtr("step", step)); const exercises = self.exercises; const stderr_file = try fs.cwd().openFile( @@ -327,7 +327,7 @@ const FailStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(FailStep, "step", step); + const self: *FailStep = @alignCast(@fieldParentPtr("step", step)); try step.result_error_msgs.append(b.allocator, self.error_msg); return error.MakeFailed; @@ -370,7 +370,7 @@ const HealStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(HealStep, "step", step); + const self: *HealStep = @alignCast(@fieldParentPtr("step", step)); return heal(b.allocator, self.exercises, self.work_path); }