| author | |
| committer | |
| log | bb17211958a236e592043895bdfba317c6e7cd16 |
| tree | 497004f5f84467e7c1e32588484fc811e31a44e2 |
| parent | fb6ab7f5646c03e867cd76208be36d82f4e38df7 |
| signature |
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 | 214 | if (listen) { |
| 215 | 215 | var stdin_reader = Io.File.stdin().reader(io, &stdin_buffer); |
| 216 | 216 | var stdout_writer = Io.File.stdout().writer(io, &stdout_buffer); |
| 217 | var server = try Server.init(.{ | |
| 217 | var server: Server = .{ | |
| 218 | 218 | .in = &stdin_reader.interface, |
| 219 | 219 | .out = &stdout_writer.interface, |
| 220 | .zig_version = builtin.zig_version_string, | |
| 221 | }); | |
| 220 | }; | |
| 221 | try server.serveStringMessage(.zig_version, builtin.zig_version_string); | |
| 222 | 222 | |
| 223 | 223 | var seen_update = false; |
| 224 | 224 | while (true) { |
lib/compiler/test_runner.zig+3-3| ... | ... | @@ -78,11 +78,11 @@ fn mainServer(init: std.process.Init.Minimal) !void { |
| 78 | 78 | @disableInstrumentation(); |
| 79 | 79 | stdin_reader = .initStreaming(.stdin(), runner_threaded_io, &stdin_buffer); |
| 80 | 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 | 82 | .in = &stdin_reader.interface, |
| 83 | 83 | .out = &stdout_writer.interface, |
| 84 | .zig_version = builtin.zig_version_string, | |
| 85 | }); | |
| 84 | }; | |
| 85 | try server.serveStringMessage(.zig_version, builtin.zig_version_string); | |
| 86 | 86 | |
| 87 | 87 | while (true) { |
| 88 | 88 | const hdr = try server.receiveMessage(); |
lib/std/zig/Server.zig-19| ... | ... | @@ -1,12 +1,8 @@ |
| 1 | 1 | const Server = @This(); |
| 2 | 2 | |
| 3 | const builtin = @import("builtin"); | |
| 4 | ||
| 5 | 3 | const std = @import("std"); |
| 6 | 4 | const Allocator = std.mem.Allocator; |
| 7 | 5 | const assert = std.debug.assert; |
| 8 | const native_endian = builtin.target.cpu.arch.endian(); | |
| 9 | const need_bswap = native_endian != .little; | |
| 10 | 6 | const Cache = std.Build.Cache; |
| 11 | 7 | const OutMessage = std.zig.Server.Message; |
| 12 | 8 | const InMessage = std.zig.Client.Message; |
| ... | ... | @@ -140,21 +136,6 @@ pub const Message = struct { |
| 140 | 136 | }; |
| 141 | 137 | }; |
| 142 | 138 | |
| 143 | pub const Options = struct { | |
| 144 | in: *Reader, | |
| 145 | out: *Writer, | |
| 146 | zig_version: []const u8, | |
| 147 | }; | |
| 148 | ||
| 149 | pub 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 | ||
| 158 | 139 | pub fn receiveMessage(s: *Server) !InMessage.Header { |
| 159 | 140 | return s.in.takeStruct(InMessage.Header, .little); |
| 160 | 141 | } |
src/main.zig+2-5| ... | ... | @@ -4305,11 +4305,8 @@ fn serve( |
| 4305 | 4305 | const gpa = comp.gpa; |
| 4306 | 4306 | const io = comp.io; |
| 4307 | 4307 | |
| 4308 | var server = try Server.init(.{ | |
| 4309 | .in = in, | |
| 4310 | .out = out, | |
| 4311 | .zig_version = build_options.version, | |
| 4312 | }); | |
| 4308 | var server: Server = .{ .in = in, .out = out }; | |
| 4309 | try server.serveStringMessage(.zig_version, build_options.version); | |
| 4313 | 4310 | |
| 4314 | 4311 | var child_pid: ?std.process.Child.Id = null; |
| 4315 | 4312 |