summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Boesch <chrboesch@noreply.codeberg.org>2025-11-01 15:33:46 +0100
committerChris Boesch <chrboesch@noreply.codeberg.org>2025-11-01 15:33:46 +0100
commitc45b9cd383b1463ca2e8cc93eb7ef38c4242d53a (patch)
tree86168d0e07293dfda8ace5810e9f84094d37b041
parent7ad02b084fa129e4f920e8b66072ba55524740eb (diff)
parent26fc4fdaaa4501db81e22a47b111f2c289c7e13f (diff)
Merge pull request 'Update for new zig IO' (#315) from esensar/exercises:fix/zig-0.16-new-io into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/315
-rw-r--r--build.zig8
-rw-r--r--test/tests.zig8
2 files changed, 10 insertions, 6 deletions
diff --git a/build.zig b/build.zig
index 9a65013..2a16899 100644
--- a/build.zig
+++ b/build.zig
@@ -570,12 +570,12 @@ const ZiglingStep = struct {
// Render compile errors at the bottom of the terminal.
// TODO: use the same ttyconf from the builder.
- const ttyconf: std.Io.tty.Config = if (use_color_escapes)
- .escape_codes
+ const color: std.zig.Color = if (use_color_escapes)
+ .on
else
- .no_color;
+ .off;
if (self.step.result_error_bundle.errorMessageCount() > 0) {
- self.step.result_error_bundle.renderToStdErr(.{ .ttyconf = ttyconf });
+ self.step.result_error_bundle.renderToStdErr(.{}, color);
}
}
};
diff --git a/test/tests.zig b/test/tests.zig
index b10f203..a242ca6 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -161,7 +161,9 @@ const CheckNamedStep = struct {
);
defer stderr_file.close();
- var stderr = stderr_file.readerStreaming(&.{});
+ var threaded: std.Io.Threaded = .init_single_threaded;
+ const io = threaded.io();
+ var stderr = stderr_file.readerStreaming(io, &.{});
{
// Skip the logo.
const nlines = mem.count(u8, root.logo, "\n");
@@ -213,7 +215,9 @@ const CheckStep = struct {
);
defer stderr_file.close();
- var stderr = stderr_file.readerStreaming(&.{});
+ var threaded: std.Io.Threaded = .init_single_threaded;
+ const io = threaded.io();
+ var stderr = stderr_file.readerStreaming(io, &.{});
for (exercises) |ex| {
if (ex.number() == 1) {
// Skip the logo.