| ... | @@ -1088,25 +1088,23 @@ pub fn bufPrint(buf: []u8, comptime fmt: []const u8, args: var) BufPrintError![] | ... | @@ -1088,25 +1088,23 @@ pub fn bufPrint(buf: []u8, comptime fmt: []const u8, args: var) BufPrintError![] |
| 1088 | return buf[0..fbs.pos]; | 1088 | return buf[0..fbs.pos]; |
| 1089 | } | 1089 | } |
| 1090 | | 1090 | |
| 1091 | // pub const AllocPrintError = error{OutOfMemory}; | 1091 | pub const AllocPrintError = error{OutOfMemory}; |
| 1092 | | 1092 | |
| 1093 | // pub fn allocPrint(allocator: *mem.Allocator, comptime fmt: []const u8, args: var) AllocPrintError![]u8 { | 1093 | pub fn allocPrint(allocator: *mem.Allocator, comptime fmt: []const u8, args: var) AllocPrintError![]u8 { |
| 1094 | // var size: usize = 0; | 1094 | // Count the characters we need to preallocate |
| 1095 | // format(&size, error{}, countSize, fmt, args) catch |err| switch (err) {}; | 1095 | var counting_stream = std.io.countingOutStream(std.io.null_out_stream); |
| 1096 | // const buf = try allocator.alloc(u8, size); | 1096 | format(counting_stream.outStream(), fmt, args) catch |err| switch (err) {}; |
| 1097 | // return bufPrint(buf, fmt, args) catch |err| switch (err) { | 1097 | |
| 1098 | // error.BufferTooSmall => unreachable, // we just counted the size above | 1098 | const buf = try allocator.alloc(u8, counting_stream.bytes_written); |
| 1099 | // }; | 1099 | return bufPrint(buf, fmt, args) catch |err| switch (err) { |
| 1100 | // } | 1100 | error.BufferTooSmall => unreachable, // we just counted the size above |
| 1101 | | 1101 | }; |
| 1102 | // fn countSize(size: *usize, bytes: []const u8) (error{}!void) { | 1102 | } |
| 1103 | // size.* += bytes.len; | 1103 | |
| 1104 | // } | 1104 | pub fn allocPrint0(allocator: *mem.Allocator, comptime fmt: []const u8, args: var) AllocPrintError![:0]u8 { |
| 1105 | | 1105 | const result = try allocPrint(allocator, fmt ++ "\x00", args); |
| 1106 | // pub fn allocPrint0(allocator: *mem.Allocator, comptime fmt: []const u8, args: var) AllocPrintError![:0]u8 { | 1106 | return result[0 .. result.len - 1 :0]; |
| 1107 | // const result = try allocPrint(allocator, fmt ++ "\x00", args); | 1107 | } |
| 1108 | // return result[0 .. result.len - 1 :0]; | | |
| 1109 | // } | | |
| 1110 | | 1108 | |
| 1111 | test "bufPrintInt" { | 1109 | test "bufPrintInt" { |
| 1112 | var buffer: [100]u8 = undefined; | 1110 | var buffer: [100]u8 = undefined; |
Benjamin Feng <benjamin.feng@glassdoor.com> 2020-02-29 15:16:04-06:00