Skip to content

Commit 23e0b06

Browse files
Chris Boeschdivinetouch
authored andcommitted
Fixed the changes from reworking std.Progress.
For details: ziglang/zig#20059
1 parent 45e4cc9 commit 23e0b06

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ that if you update one, you may need to also update the other.
8888

8989
### Version Changes
9090

91-
Version-0.12.0-dev.3518
91+
Version-0.13.0-dev.339
92+
* *2024-05-29* zig 0.13.0-dev.339 - rework std.Progress - see [#20059](https://github.com/ziglang/zig/pull/20059)
9293
* *2024-03-21* zig 0.12.0-dev.3518 - change to @fieldParentPtr - see [#19470](https://github.com/ziglang/zig/pull/19470)
9394
* *2024-03-21* zig 0.12.0-dev.3397 - rename std.os to std.posix - see [#5019](https://github.com/ziglang/zig/issues/5019)
9495
* *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)

build.zig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const print = std.debug.print;
1515
// 1) Getting Started
1616
// 2) Version Changes
1717
comptime {
18-
const required_zig = "0.12.0-dev.3518";
18+
const required_zig = "0.13.0-dev.339";
1919
const current_zig = builtin.zig_version;
2020
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
2121
if (current_zig.order(min_zig) == .lt) {
@@ -244,7 +244,7 @@ const ZiglingStep = struct {
244244
return self;
245245
}
246246

247-
fn make(step: *Step, prog_node: *std.Progress.Node) !void {
247+
fn make(step: *Step, prog_node: std.Progress.Node) !void {
248248
// NOTE: Using exit code 2 will prevent the Zig compiler to print the message:
249249
// "error: the following build command failed with exit code 1:..."
250250
const self: *ZiglingStep = @alignCast(@fieldParentPtr("step", step));
@@ -279,7 +279,7 @@ const ZiglingStep = struct {
279279
self.printErrors();
280280
}
281281

282-
fn run(self: *ZiglingStep, exe_path: []const u8, _: *std.Progress.Node) !void {
282+
fn run(self: *ZiglingStep, exe_path: []const u8, _: std.Progress.Node) !void {
283283
resetLine();
284284
print("Checking: {s}\n", .{self.exercise.main_file});
285285

@@ -375,7 +375,7 @@ const ZiglingStep = struct {
375375
print("{s}PASSED{s}\n\n", .{ green_text, reset_text });
376376
}
377377

378-
fn compile(self: *ZiglingStep, prog_node: *std.Progress.Node) !?[]const u8 {
378+
fn compile(self: *ZiglingStep, prog_node: std.Progress.Node) !?[]const u8 {
379379
print("Compiling: {s}\n", .{self.exercise.main_file});
380380

381381
const b = self.step.owner;
@@ -494,7 +494,7 @@ const PrintStep = struct {
494494
return self;
495495
}
496496

497-
fn make(step: *Step, _: *std.Progress.Node) !void {
497+
fn make(step: *Step, _: std.Progress.Node) !void {
498498
const self: *PrintStep = @alignCast(@fieldParentPtr("step", step));
499499
print("{s}", .{self.message});
500500
}

test/tests.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const CheckNamedStep = struct {
150150
return self;
151151
}
152152

153-
fn make(step: *Step, _: *std.Progress.Node) !void {
153+
fn make(step: *Step, _: std.Progress.Node) !void {
154154
const b = step.owner;
155155
const self: *CheckNamedStep = @alignCast(@fieldParentPtr("step", step));
156156
const ex = self.exercise;
@@ -202,7 +202,7 @@ const CheckStep = struct {
202202
return self;
203203
}
204204

205-
fn make(step: *Step, _: *std.Progress.Node) !void {
205+
fn make(step: *Step, _: std.Progress.Node) !void {
206206
const b = step.owner;
207207
const self: *CheckStep = @alignCast(@fieldParentPtr("step", step));
208208
const exercises = self.exercises;
@@ -325,7 +325,7 @@ const FailStep = struct {
325325
return self;
326326
}
327327

328-
fn make(step: *Step, _: *std.Progress.Node) !void {
328+
fn make(step: *Step, _: std.Progress.Node) !void {
329329
const b = step.owner;
330330
const self: *FailStep = @alignCast(@fieldParentPtr("step", step));
331331

@@ -368,7 +368,7 @@ const HealStep = struct {
368368
return self;
369369
}
370370

371-
fn make(step: *Step, _: *std.Progress.Node) !void {
371+
fn make(step: *Step, _: std.Progress.Node) !void {
372372
const b = step.owner;
373373
const self: *HealStep = @alignCast(@fieldParentPtr("step", step));
374374

0 commit comments

Comments
 (0)