authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2026-06-01 16:17:48 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2026-06-01 16:17:48 -07:00
log4d028531dd4a7fae86ffb95809302f25803785b8
tree761bb9834028dab8ce89cdcf78e361c02ea090c8
parentffadb1f7fe4ed9a716570196adeaad3bb63d8c89
signaturebadge-check Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw

update to zig 0.15.2

7 files changed, 31 insertions(+), 33 deletions(-)

build.zig+6-4
......@@ -2,7 +2,7 @@ const std = @import("std");
22
33pub fn build(b: *std.Build) void {
44 const target = b.standardTargetOptions(.{});
5 const mode = b.option(std.builtin.Mode, "mode", "") orelse .Debug;
5 const mode = b.option(std.builtin.OptimizeMode, "mode", "") orelse .Debug;
66 const disable_llvm = b.option(bool, "disable_llvm", "use the non-llvm zig codegen") orelse false;
77
88 const mod = b.addModule("extras", .{
......@@ -10,9 +10,11 @@ pub fn build(b: *std.Build) void {
1010 });
1111
1212 const tests = b.addTest(.{
13 .root_source_file = b.path("src/lib.zig"),
14 .target = target,
15 .optimize = mode,
13 .root_module = b.createModule(.{
14 .root_source_file = b.path("src/lib.zig"),
15 .target = target,
16 .optimize = mode,
17 }),
1618 });
1719 tests.root_module.addImport("extras", mod);
1820 tests.use_llvm = !disable_llvm;
src/FixedMaxBuffer.zig+1-1
......@@ -10,7 +10,7 @@ pub fn FixedMaxBuffer(comptime max_len: usize) type {
1010 pos: usize,
1111
1212 const Self = @This();
13 pub const Reader = std.io.Reader(*Self, error{}, read);
13 pub const Reader = std.io.GenericReader(*Self, error{}, read);
1414
1515 pub fn init(r: anytype, runtime_len: usize) !Self {
1616 var fmr = Self{
src/fmtByteCountIEC.zig+4-4
......@@ -12,14 +12,14 @@ fn formatByteCountIEC(bytes: u64, writer: *std.Io.Writer) !void {
1212}
1313
1414test {
15 try std.testing.expectFmt("1 B", "{}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 0))});
15 try std.testing.expectFmt("1 B", "{f}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 0))});
1616}
1717test {
18 try std.testing.expectFmt("1.000 KB", "{}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 1))});
18 try std.testing.expectFmt("1.000 KB", "{f}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 1))});
1919}
2020test {
21 try std.testing.expectFmt("1.000 MB", "{}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 2))});
21 try std.testing.expectFmt("1.000 MB", "{f}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 2))});
2222}
2323test {
24 try std.testing.expectFmt("1.000 GB", "{}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 3))});
24 try std.testing.expectFmt("1.000 GB", "{f}", .{fmtByteCountIEC(std.math.pow(u64, 1024, 3))});
2525}
src/fmtReplacer.zig+3-7
......@@ -2,7 +2,7 @@ const std = @import("std");
22const string = []const u8;
33const extras = @import("./lib.zig");
44
5pub fn fmtReplacer(bytes: string, from: u8, to: u8) std.fmt.Formatter(formatReplacer) {
5pub fn fmtReplacer(bytes: string, from: u8, to: u8) std.fmt.Alt(FormatData, formatReplacer) {
66 return .{ .data = .{
77 .bytes = bytes,
88 .from = from,
......@@ -18,12 +18,8 @@ const FormatData = struct {
1818
1919fn formatReplacer(
2020 self: FormatData,
21 comptime fmt: []const u8,
22 options: std.fmt.FormatOptions,
23 writer: anytype,
21 writer: *std.Io.Writer,
2422) !void {
25 _ = fmt;
26 _ = options;
2723 for (self.bytes) |c| {
2824 try writer.writeByte(if (c == self.from) self.to else @intCast(c));
2925 }
......@@ -32,5 +28,5 @@ fn formatReplacer(
3228test {
3329 const in = "C:\\Program Files\\Custom Utilities\\StringFinder.exe";
3430 const out = "C:/Program Files/Custom Utilities/StringFinder.exe";
35 try std.testing.expectFmt(out, "{}", .{fmtReplacer(in, '\\', '/')});
31 try std.testing.expectFmt(out, "{f}", .{fmtReplacer(in, '\\', '/')});
3632}
src/mapBy.zig+2-2
......@@ -2,8 +2,8 @@ const std = @import("std");
22const string = []const u8;
33const extras = @import("./lib.zig");
44
5pub fn mapBy(allocator: std.mem.Allocator, slice: anytype, comptime field: std.meta.FieldEnum(std.meta.Elem(@TypeOf(slice)))) ![]std.meta.FieldType(std.meta.Elem(@TypeOf(slice)), field) {
6 const newslice = try allocator.alloc(std.meta.FieldType(std.meta.Elem(@TypeOf(slice)), field), slice.len);
5pub fn mapBy(allocator: std.mem.Allocator, slice: anytype, comptime field: std.meta.FieldEnum(std.meta.Elem(@TypeOf(slice)))) ![]@FieldType(std.meta.Elem(@TypeOf(slice)), @tagName(field)) {
6 const newslice = try allocator.alloc(@FieldType(std.meta.Elem(@TypeOf(slice)), @tagName(field)), slice.len);
77 for (newslice, slice) |*i, j| i.* = @field(j, @tagName(field));
88 return newslice;
99}
src/pipe.zig+3-3
......@@ -15,8 +15,8 @@ test {
1515 const bytes = "abcdefghijklmnopqrstuvwxyz".*;
1616 var fba = std.io.fixedBufferStream(&bytes);
1717 const allocator = std.testing.allocator;
18 var list = std.ArrayList(u8).init(allocator);
18 var list = std.Io.Writer.Allocating.init(allocator);
1919 defer list.deinit();
20 try pipe(fba.reader(), list.writer());
21 try std.testing.expect(std.mem.eql(u8, &bytes, list.items));
20 try pipe(fba.reader(), &list.writer);
21 try std.testing.expect(std.mem.eql(u8, &bytes, list.written()));
2222}
src/reduceNumber.zig+12-12
......@@ -21,29 +21,29 @@ pub fn reduceNumber(writer: anytype, input: u64, comptime unit: u64, comptime ba
2121
2222test {
2323 const allocator = std.testing.allocator;
24 var list = std.ArrayList(u8).init(allocator);
24 var list = std.Io.Writer.Allocating.init(allocator);
2525 defer list.deinit();
26 try reduceNumber(list.writer(), 1, 60, "s", "mh");
27 try std.testing.expect(std.mem.eql(u8, list.items, "1 s"));
26 try reduceNumber(&list.writer, 1, 60, "s", "mh");
27 try std.testing.expect(std.mem.eql(u8, list.written(), "1 s"));
2828}
2929test {
3030 const allocator = std.testing.allocator;
31 var list = std.ArrayList(u8).init(allocator);
31 var list = std.Io.Writer.Allocating.init(allocator);
3232 defer list.deinit();
33 try reduceNumber(list.writer(), 60, 60, "s", "mh");
34 try std.testing.expect(std.mem.eql(u8, list.items, "1.000 ms"));
33 try reduceNumber(&list.writer, 60, 60, "s", "mh");
34 try std.testing.expect(std.mem.eql(u8, list.written(), "1.000 ms"));
3535}
3636test {
3737 const allocator = std.testing.allocator;
38 var list = std.ArrayList(u8).init(allocator);
38 var list = std.Io.Writer.Allocating.init(allocator);
3939 defer list.deinit();
40 try reduceNumber(list.writer(), 3600, 60, "s", "mh");
41 try std.testing.expect(std.mem.eql(u8, list.items, "1.000 hs"));
40 try reduceNumber(&list.writer, 3600, 60, "s", "mh");
41 try std.testing.expect(std.mem.eql(u8, list.written(), "1.000 hs"));
4242}
4343test {
4444 const allocator = std.testing.allocator;
45 var list = std.ArrayList(u8).init(allocator);
45 var list = std.Io.Writer.Allocating.init(allocator);
4646 defer list.deinit();
47 try reduceNumber(list.writer(), 216000, 60, "s", "mh");
48 try std.testing.expect(std.mem.eql(u8, list.items, "60.000 hs"));
47 try reduceNumber(&list.writer, 216000, 60, "s", "mh");
48 try std.testing.expect(std.mem.eql(u8, list.written(), "60.000 hs"));
4949}