From 82f021f019d8dcd7520521bb80e10d7988da27da Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 29 May 2026 15:12:13 -0700 Subject: [PATCH] use nio.fmt --- deps.zig | 2 ++ src/cmd/init.zig | 3 ++- src/cmd/install.zig | 5 +++-- src/common.zig | 3 ++- src/main.zig | 3 ++- src/util/dep_type.zig | 3 ++- src/util/module.zig | 3 ++- zig.mod | 1 + 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/deps.zig b/deps.zig index 574d2bd72ebd2221189f656c201674c80da1c7d5..096f370ee3b4f3eb050dd20e512c98ffd637fa3e 100644 --- a/deps.zig +++ b/deps.zig @@ -338,6 +338,7 @@ pub const packages = [_]*Package{ &package_data._o6ogpor87xc2, &package_data._f7dubzb7cyqe, &package_data._s84v9o48ucb0, + &package_data._kscsl0145t7x, }; pub const pkgs = struct { @@ -345,6 +346,7 @@ pub const pkgs = struct { pub const win32 = &package_data._o6ogpor87xc2; pub const extras = &package_data._f7dubzb7cyqe; pub const ansi = &package_data._s84v9o48ucb0; + pub const nio = &package_data._kscsl0145t7x; }; pub const imports = struct { diff --git a/src/cmd/init.zig b/src/cmd/init.zig index 830dba1da8d7d204fd6809c2cfcdddd614d23a39..cb17597d3cabb6193d447c7138de4a8ba2f7d124 100644 --- a/src/cmd/init.zig +++ b/src/cmd/init.zig @@ -8,6 +8,7 @@ const knownfolders = @import("known-folders"); const ini = @import("ini"); const time = @import("time"); const extras = @import("extras"); +const nio = @import("nio"); const u = @import("./../util/funcs.zig"); const common = @import("./../common.zig"); @@ -85,7 +86,7 @@ pub fn execute(self_name: []const u8, args: [][:0]u8) !void { "year:", string, "{s}", - try std.fmt.allocPrint(gpa, "{d}", .{time.DateTime.now().years}), + try nio.fmt.allocPrint(gpa, "{d}", .{time.DateTime.now().years}), )); realtext = try std.mem.replaceOwned(u8, gpa, realtext, "", try inquirer.forString( stdout, diff --git a/src/cmd/install.zig b/src/cmd/install.zig index 2c05db9b95ac4a14e8f7e120a2e2b32c7faae571..93343b462d9ec6a461cc000445629371d691c511 100644 --- a/src/cmd/install.zig +++ b/src/cmd/install.zig @@ -3,6 +3,7 @@ const string = []const u8; const gpa = std.heap.c_allocator; const knownfolders = @import("known-folders"); const extras = @import("extras"); +const nio = @import("nio"); const zigmod = @import("./../lib.zig"); const u = @import("./../util/funcs.zig"); @@ -62,8 +63,8 @@ pub fn execute(self_name: []const u8, args: [][:0]u8) !void { try ci.do(gpa, cachepath, moddir); const modfile = try zigmod.ModFile.from_dir(gpa, moddir, modpath); - const zigversion_sv = modfile.min_zig_version orelse u.fail("zigmod manifest requires min_zig_version field", .{}); - const zigversion = try std.fmt.allocPrint(gpa, "{}", .{zigversion_sv}); + _ = modfile.min_zig_version orelse u.fail("zigmod manifest requires min_zig_version field", .{}); + const zigversion = try nio.fmt.allocPrint(gpa, "{s}", .{modfile.yaml.get_string("min_zig_version").?}); const zigpath = try std.fs.path.join(gpa, &.{ datapath, "zig", zigversion, "zig" }); // zig build diff --git a/src/common.zig b/src/common.zig index 6f793cf52d70b0f2e4860a5c39b030d7f3d302d8..5a71967814bba864f69ec70fc4c336073d629dc2 100644 --- a/src/common.zig +++ b/src/common.zig @@ -3,6 +3,7 @@ const string = []const u8; const builtin = @import("builtin"); const ansi = @import("ansi"); const extras = @import("extras"); +const nio = @import("nio"); const zigmod = @import("./lib.zig"); const u = @import("./util/funcs.zig"); @@ -302,7 +303,7 @@ pub fn gen_files_package(alloc: std.mem.Allocator, cachepath: string, mdir: std. continue; } const path = try alloc.dupe(u8, p.path); - try map.put(path, try std.fmt.allocPrint(alloc, "{s}/{s}", .{ dir_path, path })); + try map.put(path, try nio.fmt.allocPrint(alloc, "{s}/{s}", .{ dir_path, path })); } } diff --git a/src/main.zig b/src/main.zig index c0fbaad11e58151504333438f1df36a788cd2b66..9ed7b3d008c90be3ec3b74c02ea28fcc12f3dffe 100644 --- a/src/main.zig +++ b/src/main.zig @@ -4,6 +4,7 @@ const builtin = @import("builtin"); pub const build_options = @import("build_options"); const zigmod = @import("zigmod"); const win32 = @import("win32"); +const nio = @import("nio"); // // @@ -56,7 +57,7 @@ pub fn main() !void { } var sub_cmd_args = std.ArrayList(string).init(gpa); - try sub_cmd_args.append(try std.fmt.allocPrint(gpa, "zigmod-{s}", .{args[0]})); + try sub_cmd_args.append(try nio.fmt.allocPrint(gpa, "zigmod-{s}", .{args[0]})); for (args[1..]) |item| { try sub_cmd_args.append(item); } diff --git a/src/util/dep_type.zig b/src/util/dep_type.zig index 1e822042af8efbccb0aa8ec9133c862ecacb3787..287a2037e7813d260377a5f3ef2a70b03e17066c 100644 --- a/src/util/dep_type.zig +++ b/src/util/dep_type.zig @@ -1,5 +1,6 @@ const std = @import("std"); const string = []const u8; +const nio = @import("nio"); const u = @import("./funcs.zig"); @@ -68,7 +69,7 @@ pub const DepType = enum { .local => "", .system_lib => "", .framework => "", - .git => try std.fmt.allocPrint(alloc, "commit-{s}", .{(try u.git_rev_HEAD(alloc, mdir))}), + .git => try nio.fmt.allocPrint(alloc, "commit-{s}", .{(try u.git_rev_HEAD(alloc, mdir))}), .hg => "", .http => "", }; diff --git a/src/util/module.zig b/src/util/module.zig index 9f1a1f154643bf4781014fa646e80f14995c1c31..2a897bdcd11a806a1b0bddc8318690c84a9f13e5 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -3,6 +3,7 @@ const string = []const u8; const builtin = @import("builtin"); const yaml = @import("yaml"); const extras = @import("extras"); +const nio = @import("nio"); const zigmod = @import("../lib.zig"); const u = @import("funcs.zig"); @@ -95,7 +96,7 @@ pub const Module = struct { } var out: [32]u8 = undefined; h.final(&out); - const hex = try std.fmt.allocPrint(alloc, "blake3-{x}", .{std.fmt.fmtSliceHexLower(out[0..])}); + const hex = try nio.fmt.allocPrint(alloc, "blake3-{s}", .{&extras.to_hex(out)}); return hex; } diff --git a/zig.mod b/zig.mod index 4214c5dad32dddd532a7942768f595ce48fd6571..02052f0e01e50232018274e41c59d72aefe570fd 100644 --- a/zig.mod +++ b/zig.mod @@ -35,3 +35,4 @@ root_dependencies: license: MIT - src: git https://github.com/nektro/zig-extras - src: git https://github.com/nektro/zig-ansi + - src: git https://github.com/nektro/zig-nio -- 2.54.0