Skip to content

Commit 7806857

Browse files
committed
remove unused init, and remove magic pre-alloc
1 parent 6002522 commit 7806857

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

src/log.zig

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,7 @@ fn LogT(comptime Out: type) type {
8989

9090
const Self = @This();
9191

92-
fn init(allocator: Allocator, opts: Opts) !Self {
93-
return initTo(allocator, opts, std.io.getStdOut());
94-
}
95-
96-
// Used for tests
97-
fn initTo(allocator: Allocator, opts: Opts, out: Out) !Self {
92+
fn init(allocator: Allocator, opts: Opts, out: Out) !Self {
9893
var buffer: std.ArrayListUnmanaged(u8) = .{};
9994
try buffer.ensureTotalCapacity(allocator, 2048);
10095

@@ -159,9 +154,7 @@ fn LogT(comptime Out: type) type {
159154
buffer.appendSliceAssumeCapacity(level_and_msg);
160155
inline for (@typeInfo(@TypeOf(data)).@"struct".fields) |f| {
161156
const key = " " ++ f.name ++ "=";
162-
163-
// + 5 covers null/true/false
164-
try buffer.ensureUnusedCapacity(allocator, key.len + 5);
157+
try buffer.ensureUnusedCapacity(allocator, key.len);
165158
buffer.appendSliceAssumeCapacity(key);
166159
try writeValue(allocator, buffer, true, @field(data, f.name));
167160
}
@@ -234,7 +227,7 @@ const Pool = struct {
234227
for (0..count) |i| {
235228
const logger = try allocator.create(Log);
236229
errdefer allocator.destroy(logger);
237-
logger.* = try Log.initTo(allocator, opts, out);
230+
logger.* = try Log.init(allocator, opts, out);
238231
loggers[i] = logger;
239232
started += 1;
240233
}
@@ -290,15 +283,13 @@ pub fn writeValue(allocator: Allocator, buffer: *std.ArrayListUnmanaged(u8), esc
290283
if (value) |v| {
291284
return writeValue(allocator, buffer, escape_string, v);
292285
}
293-
// in _log, we reserved space for a value of up to 5 bytes.
294-
return buffer.appendSliceAssumeCapacity("null");
286+
return buffer.appendSlice(allocator, "null");
295287
},
296288
.comptime_int, .int, .comptime_float, .float => {
297289
return std.fmt.format(buffer.writer(allocator), "{d}", .{value});
298290
},
299291
.bool => {
300-
// in _log, we reserved space for a value of up to 5 bytes.
301-
return buffer.appendSliceAssumeCapacity(if (value) "true" else "false");
292+
return buffer.appendSlice(allocator, if (value) "true" else "false");
302293
},
303294
.error_set => return buffer.appendSlice(allocator, @errorName(value)),
304295
.@"enum" => return buffer.appendSlice(allocator, @tagName(value)),
@@ -422,7 +413,7 @@ test "log: data" {
422413
var buf: std.ArrayListUnmanaged(u8) = .{};
423414
defer buf.deinit(testing.allocator);
424415

425-
var logger = try TestLogger.initTo(testing.allocator, .{ .format = .logfmt }, buf.writer(testing.allocator));
416+
var logger = try TestLogger.init(testing.allocator, .{ .format = .logfmt }, buf.writer(testing.allocator));
426417
defer logger.deinit();
427418

428419
{
@@ -461,7 +452,7 @@ test "log: string escape" {
461452
var buf: std.ArrayListUnmanaged(u8) = .{};
462453
defer buf.deinit(testing.allocator);
463454

464-
var logger = try TestLogger.initTo(testing.allocator, .{ .format = .logfmt }, buf.writer(testing.allocator));
455+
var logger = try TestLogger.init(testing.allocator, .{ .format = .logfmt }, buf.writer(testing.allocator));
465456
defer logger.deinit();
466457

467458
const prefix = "$time=1739795092929 $scope=scope $level=error $msg=test ";

0 commit comments

Comments
 (0)