neurocyte/thespian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: API changes for zig-0.15.1

Browse source
This commit is contained in:
CJ van den Berg 2025-08-22 14:07:31 +02:00
parent f823f66c90
commit 51751adce6
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/thespian.zig
View file

@ -30,7 +30,7 @@ pub const sighdl_backtrace = if (builtin.os.tag != .windows) c_posix.sighdl_back
pub const max_message_size = 8 * 4096; pub const max_message_size = 8 * 4096;
const message_buf_allocator = std.heap.c_allocator; const message_buf_allocator = std.heap.c_allocator;
threadlocal var message_buffer: std.ArrayList(u8) = std.ArrayList(u8).init(message_buf_allocator); threadlocal var message_buffer: std.ArrayList(u8) = .empty;
threadlocal var error_message_buffer: [256]u8 = undefined; threadlocal var error_message_buffer: [256]u8 = undefined;
threadlocal var error_buffer_tl: c.thespian_error = .{ threadlocal var error_buffer_tl: c.thespian_error = .{
.base = null, .base = null,
@ -147,6 +147,7 @@ pub const message = struct {
pub fn fmt(value: anytype) Self { pub fn fmt(value: anytype) Self {
message_buffer.clearRetainingCapacity(); message_buffer.clearRetainingCapacity();
var writer = std.Io.Writer.Allocating.fromArrayList(message_buf_allocator, &message_buffer);
const f = comptime switch (@typeInfo(@TypeOf(value))) { const f = comptime switch (@typeInfo(@TypeOf(value))) {
.@"struct" => |info| if (info.is_tuple) .@"struct" => |info| if (info.is_tuple)
fmt_internal fmt_internal
@ -154,15 +155,16 @@ pub const message = struct {
@compileError("thespian.message template should be a tuple: " ++ @typeName(@TypeOf(value))), @compileError("thespian.message template should be a tuple: " ++ @typeName(@TypeOf(value))),
else => fmt_internal_scalar, else => fmt_internal_scalar,
}; };
f(message_buffer.writer(), value) catch |e| std.debug.panic("thespian.message.fmt: {any}", .{e}); f(&writer.writer, value) catch |e| std.debug.panic("thespian.message.fmt: {any}", .{e});
message_buffer = writer.toArrayList();
return .{ .buf = message_buffer.items }; return .{ .buf = message_buffer.items };
} }
fn fmt_internal_scalar(writer: std.ArrayList(u8).Writer, value: anytype) !void { fn fmt_internal_scalar(writer: *std.Io.Writer, value: anytype) !void {
return fmt_internal(writer, .{value}); return fmt_internal(writer, .{value});
} }
fn fmt_internal(writer: std.ArrayList(u8).Writer, value: anytype) !void { fn fmt_internal(writer: *std.Io.Writer, value: anytype) !void {
try cbor.writeValue(writer, value); try cbor.writeValue(writer, value);
} }
@ -182,9 +184,9 @@ pub const message = struct {
} }
fn fmtbuf_internal(buf: []u8, value: anytype) !Self { fn fmtbuf_internal(buf: []u8, value: anytype) !Self {
var stream = std.io.fixedBufferStream(buf); var stream: std.Io.Writer = .fixed(buf);
try cbor.writeValue(stream.writer(), value); try cbor.writeValue(&stream, value);
return .{ .buf = stream.getWritten() }; return .{ .buf = stream.buffered() };
} }
pub fn len(self: Self) usize { pub fn len(self: Self) usize {
@ -232,7 +234,7 @@ pub fn exit_message(e: anytype, stack_trace: ?*std.builtin.StackTrace) message {
const a = debug_info_arena_allocator.allocator(); const a = debug_info_arena_allocator.allocator();
var out: std.Io.Writer.Allocating = .init(a); var out: std.Io.Writer.Allocating = .init(a);
store_stack_trace(stack_trace_.*, &out.writer); store_stack_trace(stack_trace_.*, &out.writer);
return message.fmtbuf(&error_message_buffer, .{ "exit", e, out.getWritten() }) catch unreachable; return message.fmtbuf(&error_message_buffer, .{ "exit", e, out.writer.buffered() }) catch unreachable;
} else { } else {
return message.fmtbuf(&error_message_buffer, .{ "exit", e }) catch unreachable; return message.fmtbuf(&error_message_buffer, .{ "exit", e }) catch unreachable;
} }