authorgravatar for techatrix@mailbox.orgTechatrix <techatrix@mailbox.org> 2026-07-10 21:05:26+02:00
committergravatar for techatrix@mailbox.orgTechatrix <techatrix@mailbox.org> 2026-07-21 14:34:41+02:00
logbb17211958a236e592043895bdfba317c6e7cd16
tree497004f5f84467e7c1e32588484fc811e31a44e2
parentfb6ab7f5646c03e867cd76208be36d82f4e38df7
signaturebadge-check Signed by SSH key SHA256:HYC3SjXQcAt6uwv9pu/6OoVQ2rUH8rb5zKiUHSe9uxk

std.zig.Server: remove init function

The `.zig_version` message will not be used by the build system protocol.

4 files changed, 8 insertions(+), 30 deletions(-)

lib/compiler/objcopy.zig+3-3
...@@ -214,11 +214,11 @@ fn cmdObjCopy(arena: Allocator, io: Io, args: []const []const u8) !void {...@@ -214,11 +214,11 @@ fn cmdObjCopy(arena: Allocator, io: Io, args: []const []const u8) !void {
214 if (listen) {214 if (listen) {
215 var stdin_reader = Io.File.stdin().reader(io, &stdin_buffer);215 var stdin_reader = Io.File.stdin().reader(io, &stdin_buffer);
216 var stdout_writer = Io.File.stdout().writer(io, &stdout_buffer);216 var stdout_writer = Io.File.stdout().writer(io, &stdout_buffer);
217 var server = try Server.init(.{217 var server: Server = .{
218 .in = &stdin_reader.interface,218 .in = &stdin_reader.interface,
219 .out = &stdout_writer.interface,219 .out = &stdout_writer.interface,
220 .zig_version = builtin.zig_version_string,220 };
221 });221 try server.serveStringMessage(.zig_version, builtin.zig_version_string);
222222
223 var seen_update = false;223 var seen_update = false;
224 while (true) {224 while (true) {
lib/compiler/test_runner.zig+3-3
...@@ -78,11 +78,11 @@ fn mainServer(init: std.process.Init.Minimal) !void {...@@ -78,11 +78,11 @@ fn mainServer(init: std.process.Init.Minimal) !void {
78 @disableInstrumentation();78 @disableInstrumentation();
79 stdin_reader = .initStreaming(.stdin(), runner_threaded_io, &stdin_buffer);79 stdin_reader = .initStreaming(.stdin(), runner_threaded_io, &stdin_buffer);
80 stdout_writer = .initStreaming(.stdout(), runner_threaded_io, &stdout_buffer);80 stdout_writer = .initStreaming(.stdout(), runner_threaded_io, &stdout_buffer);
81 var server = try std.zig.Server.init(.{81 var server: std.zig.Server = .{
82 .in = &stdin_reader.interface,82 .in = &stdin_reader.interface,
83 .out = &stdout_writer.interface,83 .out = &stdout_writer.interface,
84 .zig_version = builtin.zig_version_string,84 };
85 });85 try server.serveStringMessage(.zig_version, builtin.zig_version_string);
8686
87 while (true) {87 while (true) {
88 const hdr = try server.receiveMessage();88 const hdr = try server.receiveMessage();
lib/std/zig/Server.zig-19
...@@ -1,12 +1,8 @@...@@ -1,12 +1,8 @@
1const Server = @This();1const Server = @This();
22
3const builtin = @import("builtin");
4
5const std = @import("std");3const std = @import("std");
6const Allocator = std.mem.Allocator;4const Allocator = std.mem.Allocator;
7const assert = std.debug.assert;5const assert = std.debug.assert;
8const native_endian = builtin.target.cpu.arch.endian();
9const need_bswap = native_endian != .little;
10const Cache = std.Build.Cache;6const Cache = std.Build.Cache;
11const OutMessage = std.zig.Server.Message;7const OutMessage = std.zig.Server.Message;
12const InMessage = std.zig.Client.Message;8const InMessage = std.zig.Client.Message;
...@@ -140,21 +136,6 @@ pub const Message = struct {...@@ -140,21 +136,6 @@ pub const Message = struct {
140 };136 };
141};137};
142138
143pub const Options = struct {
144 in: *Reader,
145 out: *Writer,
146 zig_version: []const u8,
147};
148
149pub fn init(options: Options) !Server {
150 var s: Server = .{
151 .in = options.in,
152 .out = options.out,
153 };
154 try s.serveStringMessage(.zig_version, options.zig_version);
155 return s;
156}
157
158pub fn receiveMessage(s: *Server) !InMessage.Header {139pub fn receiveMessage(s: *Server) !InMessage.Header {
159 return s.in.takeStruct(InMessage.Header, .little);140 return s.in.takeStruct(InMessage.Header, .little);
160}141}
src/main.zig+2-5
...@@ -4305,11 +4305,8 @@ fn serve(...@@ -4305,11 +4305,8 @@ fn serve(
4305 const gpa = comp.gpa;4305 const gpa = comp.gpa;
4306 const io = comp.io;4306 const io = comp.io;
43074307
4308 var server = try Server.init(.{4308 var server: Server = .{ .in = in, .out = out };
4309 .in = in,4309 try server.serveStringMessage(.zig_version, build_options.version);
4310 .out = out,
4311 .zig_version = build_options.version,
4312 });
43134310
4314 var child_pid: ?std.process.Child.Id = null;4311 var child_pid: ?std.process.Child.Id = null;
43154312