| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | const std = @import("std"); |
| 4 | 4 | const builtin = @import("builtin"); |
| 5 | 5 | const extras = @import("extras"); |
| 6 | const nio = @import("./nio.zig"); |
| 6 | 7 | |
| 7 | 8 | /// Renders fmt string with args, calling `writer` with slices of bytes. |
| 8 | 9 | /// If `writer` returns an error, the error is returned from `format` and |
| ... | ... | @@ -808,20 +809,20 @@ fn formatBuf(buf: []const u8, options: FormatOptions, writer: anytype) !void { |
| 808 | 809 | |
| 809 | 810 | /// Count the characters needed for format. Useful for preallocating memory |
| 810 | 811 | fn count(comptime fmt: []const u8, args: anytype) u64 { |
| 811 | | var counting_writer = std.io.countingWriter(std.io.null_writer); |
| 812 | | format(counting_writer.writer().any(), fmt, args) catch unreachable; |
| 812 | var counting_writer: nio.CountingWriter(nio.NullWriter) = .init(.{}); |
| 813 | format(&counting_writer, fmt, args) catch unreachable; |
| 813 | 814 | return counting_writer.bytes_written; |
| 814 | 815 | } |
| 815 | 816 | |
| 816 | 817 | /// Print a Formatter string into `buf`. Actually just a thin wrapper around `format` and `fixedBufferStream`. |
| 817 | 818 | /// Returns a slice of the bytes printed to. |
| 818 | 819 | fn bufPrint(buf: []u8, comptime fmt: []const u8, args: anytype) ![]u8 { |
| 819 | | var fbs = std.io.fixedBufferStream(buf); |
| 820 | | format(fbs.writer().any(), fmt, args) catch |err| switch (err) { |
| 820 | var fbs: nio.FixedBufferStream([]u8) = .init(buf); |
| 821 | format(&fbs, fmt, args) catch |err| switch (err) { |
| 821 | 822 | error.NoSpaceLeft => return error.NoSpaceLeft, |
| 822 | 823 | else => unreachable, |
| 823 | 824 | }; |
| 824 | | return fbs.getWritten(); |
| 825 | return fbs.written(); |
| 825 | 826 | } |
| 826 | 827 | |
| 827 | 828 | const digits2_alphabet = blk: { |
| ... | ... | @@ -920,11 +921,11 @@ fn formatFloatValue(value: anytype, comptime fmt: []const u8, options: FormatOpt |
| 920 | 921 | }; |
| 921 | 922 | return formatBuf(s, options, writer); |
| 922 | 923 | } else if (comptime std.mem.eql(u8, fmt, "x")) { |
| 923 | | var buf_stream = std.io.fixedBufferStream(&buf); |
| 924 | | std.fmt.formatFloatHexadecimal(value, options, buf_stream.writer()) catch |err| switch (err) { |
| 924 | var buf_stream: nio.FixedBufferStream([]u8) = .init(&buf); |
| 925 | std.fmt.formatFloatHexadecimal(value, options, &buf_stream) catch |err| switch (err) { |
| 925 | 926 | error.NoSpaceLeft => unreachable, |
| 926 | 927 | }; |
| 927 | | return formatBuf(buf_stream.getWritten(), options, writer); |
| 928 | return formatBuf(buf_stream.written(), options, writer); |
| 928 | 929 | } else { |
| 929 | 930 | invalidFmtError(fmt, value); |
| 930 | 931 | } |
Meghan Denny <hello@nektro.net> 2026-05-06 02:59:39 -07:00
Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw