a/ziglings
1
0
Fork 0
mirror of https://codeberg.org/andyscott/ziglings.git synced 2024-11-09 19:40:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Fixed the changes from reworking std.Progress.' (#101) from v339 into main

Browse source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/101
This commit is contained in:
Chris Boesch 2024-05-29 19:29:56 +00:00
commit 227bcb18db
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -88,7 +88,8 @@ that if you update one, you may need to also update the other.
### Version Changes ### Version Changes
Version-0.12.0-dev.3518 Version-0.13.0-dev.339
* *2024-05-29* zig 0.13.0-dev.339 - rework std.Progress - see [#20059](https://github.com/ziglang/zig/pull/20059)
* *2024-03-21* zig 0.12.0-dev.3518 - change to @fieldParentPtr - see [#19470](https://github.com/ziglang/zig/pull/19470) * *2024-03-21* zig 0.12.0-dev.3518 - change to @fieldParentPtr - see [#19470](https://github.com/ziglang/zig/pull/19470)
* *2024-03-21* zig 0.12.0-dev.3397 - rename std.os to std.posix - see [#5019](https://github.com/ziglang/zig/issues/5019) * *2024-03-21* zig 0.12.0-dev.3397 - rename std.os to std.posix - see [#5019](https://github.com/ziglang/zig/issues/5019)
* *2024-03-14* zig 0.12.0-dev.3302 - changes in `std.fmt` - floating-point formatting implementation - see [#19229](https://github.com/ziglang/zig/pull/19229) * *2024-03-14* zig 0.12.0-dev.3302 - changes in `std.fmt` - floating-point formatting implementation - see [#19229](https://github.com/ziglang/zig/pull/19229)

10
build.zig
View file

@ -15,7 +15,7 @@ const print = std.debug.print;
// 1) Getting Started // 1) Getting Started
// 2) Version Changes // 2) Version Changes
comptime { comptime {
const required_zig = "0.12.0-dev.3518"; const required_zig = "0.13.0-dev.339";
const current_zig = builtin.zig_version; const current_zig = builtin.zig_version;
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable; const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
if (current_zig.order(min_zig) == .lt) { if (current_zig.order(min_zig) == .lt) {
@ -244,7 +244,7 @@ const ZiglingStep = struct {
return self; return self;
} }
fn make(step: *Step, prog_node: *std.Progress.Node) !void { fn make(step: *Step, prog_node: std.Progress.Node) !void {
// NOTE: Using exit code 2 will prevent the Zig compiler to print the message: // NOTE: Using exit code 2 will prevent the Zig compiler to print the message:
// "error: the following build command failed with exit code 1:..." // "error: the following build command failed with exit code 1:..."
const self: *ZiglingStep = @alignCast(@fieldParentPtr("step", step)); const self: *ZiglingStep = @alignCast(@fieldParentPtr("step", step));
@ -279,7 +279,7 @@ const ZiglingStep = struct {
self.printErrors(); self.printErrors();
} }
fn run(self: *ZiglingStep, exe_path: []const u8, _: *std.Progress.Node) !void { fn run(self: *ZiglingStep, exe_path: []const u8, _: std.Progress.Node) !void {
resetLine(); resetLine();
print("Checking: {s}\n", .{self.exercise.main_file}); print("Checking: {s}\n", .{self.exercise.main_file});
@ -375,7 +375,7 @@ const ZiglingStep = struct {
print("{s}PASSED{s}\n\n", .{ green_text, reset_text }); print("{s}PASSED{s}\n\n", .{ green_text, reset_text });
} }
fn compile(self: *ZiglingStep, prog_node: *std.Progress.Node) !?[]const u8 { fn compile(self: *ZiglingStep, prog_node: std.Progress.Node) !?[]const u8 {
print("Compiling: {s}\n", .{self.exercise.main_file}); print("Compiling: {s}\n", .{self.exercise.main_file});
const b = self.step.owner; const b = self.step.owner;
@ -494,7 +494,7 @@ const PrintStep = struct {
return self; return self;
} }
fn make(step: *Step, _: *std.Progress.Node) !void { fn make(step: *Step, _: std.Progress.Node) !void {
const self: *PrintStep = @alignCast(@fieldParentPtr("step", step)); const self: *PrintStep = @alignCast(@fieldParentPtr("step", step));
print("{s}", .{self.message}); print("{s}", .{self.message});
} }

8
test/tests.zig
View file

@ -150,7 +150,7 @@ const CheckNamedStep = struct {
return self; return self;
} }
fn make(step: *Step, _: *std.Progress.Node) !void { fn make(step: *Step, _: std.Progress.Node) !void {
const b = step.owner; const b = step.owner;
const self: *CheckNamedStep = @alignCast(@fieldParentPtr("step", step)); const self: *CheckNamedStep = @alignCast(@fieldParentPtr("step", step));
const ex = self.exercise; const ex = self.exercise;
@ -202,7 +202,7 @@ const CheckStep = struct {
return self; return self;
} }
fn make(step: *Step, _: *std.Progress.Node) !void { fn make(step: *Step, _: std.Progress.Node) !void {
const b = step.owner; const b = step.owner;
const self: *CheckStep = @alignCast(@fieldParentPtr("step", step)); const self: *CheckStep = @alignCast(@fieldParentPtr("step", step));
const exercises = self.exercises; const exercises = self.exercises;
@ -325,7 +325,7 @@ const FailStep = struct {
return self; return self;
} }
fn make(step: *Step, _: *std.Progress.Node) !void { fn make(step: *Step, _: std.Progress.Node) !void {
const b = step.owner; const b = step.owner;
const self: *FailStep = @alignCast(@fieldParentPtr("step", step)); const self: *FailStep = @alignCast(@fieldParentPtr("step", step));
@ -368,7 +368,7 @@ const HealStep = struct {
return self; return self;
} }
fn make(step: *Step, _: *std.Progress.Node) !void { fn make(step: *Step, _: std.Progress.Node) !void {
const b = step.owner; const b = step.owner;
const self: *HealStep = @alignCast(@fieldParentPtr("step", step)); const self: *HealStep = @alignCast(@fieldParentPtr("step", step));