diff --git a/src/fmtByteCountIEC.zig b/src/fmtByteCountIEC.zig index 84954a9147e060617721b403c17b6a006deae124..fa494cc8df5553af88d71f6994d50dc6abe5c769 100644 --- a/src/fmtByteCountIEC.zig +++ b/src/fmtByteCountIEC.zig @@ -3,13 +3,11 @@ const string = []const u8; const extras = @import("./lib.zig"); const reduceNumber = extras.reduceNumber; -pub fn fmtByteCountIEC(b: u64) std.fmt.Formatter(formatByteCountIEC) { +pub fn fmtByteCountIEC(b: u64) std.fmt.Alt(u64, formatByteCountIEC) { return .{ .data = b }; } -fn formatByteCountIEC(bytes: u64, comptime fmt: []const u8, options: std.fmt.FormatOptions, writer: anytype) !void { - _ = fmt; - _ = options; +fn formatByteCountIEC(bytes: u64, writer: *std.Io.Writer) !void { try reduceNumber(writer, bytes, 1024, "B", "KMGTPEZYRQ"); } diff --git a/src/sortBySlice.zig b/src/sortBySlice.zig index 1f4bb5f33677a0e5f94e2d29ce7c5911083092b7..66049aac7f6fde1676afacd35ddc298d41839146 100644 --- a/src/sortBySlice.zig +++ b/src/sortBySlice.zig @@ -6,7 +6,7 @@ const lessThanSlice = extras.lessThanSlice; pub fn sortBySlice(comptime T: type, items: []T, comptime field: std.meta.FieldEnum(T)) void { std.mem.sort(T, items, {}, struct { fn f(_: void, lhs: T, rhs: T) bool { - return lessThanSlice(std.meta.FieldType(T, field))({}, @field(lhs, @tagName(field)), @field(rhs, @tagName(field))); + return lessThanSlice(@FieldType(T, @tagName(field)))({}, @field(lhs, @tagName(field)), @field(rhs, @tagName(field))); } }.f); }