6 Commits

Author SHA1 Message Date
Chris Boesch f39b462659 Merge pull request 'fixed formatting error' (#496) from format_error into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/496
2026-07-21 21:06:57 +02:00
Chris Boesch a2eee9d52f fixed formatting error 2026-07-21 20:54:27 +02:00
Chris Boesch 248093a2de Merge pull request '026 thier to their' (#489) from geoffreygordonashbrook/ziglings_exercises_fork:main into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/489
2026-07-05 22:51:52 +02:00
lineality 004ea3b3ae 026 thier to their 2026-07-05 13:32:37 -04:00
Chris Boesch c85daab1a1 Merge pull request 'rivendell: Remove the resetLine function' (#488) from manliop/exercises:remove-resetLine into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/488
2026-07-02 23:56:15 +02:00
Manlio Perillo f6c3e4edc4 rivendell: Remove the resetLine function
This was necessary in the past (commit 30db9d, 2023-04-17).

The new Progress.zig and, probably, the fact that exercises run on a
separate executable solved the problem.
2026-07-02 15:07:51 +02:00
3 changed files with 8 additions and 12 deletions
+1 -1
View File
@@ -36,5 +36,5 @@ pub fn main(init: std.process.Init) !void {
// 'std.debug.print()' prints its output to stderr, while the stdout_writer
// approach prints to stdout.
// A common practice is to pipe output of a command to other commands,
// and in order for the piping to work, those commands expect thier input
// and in order for the piping to work, those commands expect their input
// to come from stdout, not stderr.
+7 -5
View File
@@ -1,5 +1,5 @@
--- exercises/036_enums2.zig 2023-10-03 22:15:22.122241138 +0200
+++ answers/036_enums2.zig 2023-10-05 20:04:07.002765884 +0200
--- exercises/036_enums2.zig 2026-07-21 20:48:50.596099259 +0200
+++ answers/036_enums2.zig 2026-07-21 20:50:14.726826859 +0200
@@ -31,7 +31,7 @@
const Color = enum(u32) {
red = 0xff0000,
@@ -18,9 +18,11 @@
\\</p>
\\
, .{
@intFromEnum(Color.red),
@intFromEnum(Color.green),
- @intFromEnum(Color.red),
- @intFromEnum(Color.green),
- @intFromEnum(???), // Oops! We're missing something!
+ @intFromEnum(Color.blue), // Oops! We're missing something!
+ @backingInt(Color.red),
+ @backingInt(Color.green),
+ @backingInt(Color.blue), // Oops! We're missing something!
});
}
-6
View File
@@ -359,7 +359,6 @@ fn runExe(ctx: Context, ex: Exercise) !void {
return err;
};
resetLine();
print("Checking {s}...\n", .{ex.main_file});
return checkOutput(io, arena, ex, result);
@@ -392,7 +391,6 @@ fn runTest(ctx: Context, ex: Exercise) !void {
return err;
};
resetLine();
print("Checking {s}...\n", .{ex.main_file});
return checkTest(ex, result);
@@ -486,10 +484,6 @@ fn help(ex: Exercise, mode: Mode) void {
});
}
fn resetLine() void {
if (stderr_term_mode == .escape_codes) print("{s}", .{"\x1b[2K\r"});
}
// Removes trailing whitespace per line and any trailing LF at the end.
fn trimLines(arena: std.mem.Allocator, buf: []const u8) ![]const u8 {
var list = try std.ArrayList(u8).initCapacity(arena, buf.len);