From 4714ec2bf96b0dd98bcd27090a4518d967560806 Mon Sep 17 00:00:00 2001 From: Yves Biener Date: Mon, 4 Aug 2025 21:01:18 +0200 Subject: [PATCH] chor: update zig version --- build.zig | 34 ++++++++++++++++++++++------------ src/zlog.zig | 4 +++- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/build.zig b/build.zig index 40477d7..1bf6c88 100644 --- a/build.zig +++ b/build.zig @@ -38,18 +38,24 @@ pub fn build(b: *std.Build) void { .root_source_file = b.path("src/zlog.zig"), .target = target, .optimize = optimize, + .imports = &.{ + .{ .name = "ztime", .module = ztime_dependency.module("ztime") }, + .{ .name = "build_options", .module = options_module }, + }, }); - zlog_module.addImport("ztime", ztime_dependency.module("ztime")); - zlog_module.addImport("build_options", options_module); const exe = b.addExecutable(.{ .name = "zlog", - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .root_source_file = b.path("src/main.zig"), + .target = target, + .optimize = optimize, + .imports = &.{ + .{ .name = "ztime", .module = ztime_dependency.module("ztime") }, + .{ .name = "zlog", .module = zlog_module }, + }, + }), }); - exe.root_module.addImport("ztime", ztime_dependency.module("ztime")); - exe.root_module.addImport("zlog", zlog_module); // This declares intent for the executable to be installed into the // standard location when the user invokes the "install" step (the default @@ -82,12 +88,16 @@ pub fn build(b: *std.Build) void { // Creates a step for unit testing. This only builds the test executable // but does not run it. const lib_unit_tests = b.addTest(.{ - .root_source_file = b.path("src/zlog.zig"), - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .root_source_file = b.path("src/zlog.zig"), + .target = target, + .optimize = optimize, + .imports = &.{ + .{ .name = "ztime", .module = ztime_dependency.module("ztime") }, + .{ .name = "build_options", .module = options_module }, + }, + }), }); - lib_unit_tests.root_module.addImport("ztime", ztime_dependency.module("ztime")); - lib_unit_tests.root_module.addImport("build_options", options_module); const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests); diff --git a/src/zlog.zig b/src/zlog.zig index b036b26..c25db64 100644 --- a/src/zlog.zig +++ b/src/zlog.zig @@ -35,7 +35,7 @@ fn logFn( } if (comptime build_options.stderr) { - var buffer = io.bufferedWriter(io.getStdErr().writer()); + var buffer = io.bufferedWriter(stderr().deprecatedWriter()); defer buffer.flush() catch {}; std.debug.lockStdErr(); @@ -193,6 +193,8 @@ pub const std_options: std.Options = .{ const std = @import("std"); const io = std.io; +const fs = std.fs; +const stderr = fs.File.stderr; const log = std.log; const fmt = std.fmt; const build_options = @import("build_options");