diff --git a/crdt-demo/runner.zig b/crdt-demo/runner.zig index 6baacb9..113106f 100644 --- a/crdt-demo/runner.zig +++ b/crdt-demo/runner.zig @@ -2,6 +2,7 @@ //! CRDT server binary, then waits for the server to exit. const std = @import("std"); +const spawn = spawn; pub fn main(init: std.process.Init) !void { const io = init.io; @@ -14,7 +15,7 @@ pub fn main(init: std.process.Init) !void { const www_dir = args.next() orelse return error.MissingArg; const server_bin = args.next() orelse return error.MissingArg; - var python_child = try std.process.spawn(io, .{ + var python_child = try spawn(io, .{ .argv = &.{ python, "-m", "http.server", "-d", www_dir }, .stdin = .ignore, .stdout = .inherit, @@ -22,7 +23,7 @@ pub fn main(init: std.process.Init) !void { }); errdefer python_child.kill(io); - var server_child = try std.process.spawn(io, .{ + var server_child = try spawn(io, .{ .argv = &.{ server_bin }, .stdin = .ignore, .stdout = .ignore, diff --git a/crdt-demo/src/demo.zig b/crdt-demo/src/demo.zig index 347a6cd..63632ba 100644 --- a/crdt-demo/src/demo.zig +++ b/crdt-demo/src/demo.zig @@ -6,6 +6,8 @@ //! counter. JS glue in www/demo.js drives a contenteditable editor. const std = @import("std"); const crdt = @import("crdt"); +const Stringify = std.json.Stringify; +const parseFromSlice = std.json.parseFromSlice; const ReplicaId = crdt.ReplicaId; const Rga = crdt.Rga(u8); @@ -125,7 +127,7 @@ export fn get_state_json(handle_ptr: usize) void { const crdt_val = Crdt{ .rga = handle.rga }; var buf: std.Io.Writer.Allocating = .init(allocator); defer buf.deinit(); - std.json.Stringify.value(crdt_val, .{}, &buf.writer) catch { + Stringify.value(crdt_val, .{}, &buf.writer) catch { output.clearRetainingCapacity(); return; }; @@ -146,7 +148,7 @@ export fn get_state_json(handle_ptr: usize) void { export fn merge_json(handle_ptr: usize, json_ptr: [*]const u8, json_len: usize) void { const handle = handle_map.get(handle_ptr) orelse return; const json_slice = json_ptr[0..json_len]; - const parsed = std.json.parseFromSlice(Crdt, allocator, json_slice, .{}) catch return; + const parsed = parseFromSlice(Crdt, allocator, json_slice, .{}) catch return; defer parsed.deinit(); handle.rga.merge(parsed.value.rga, allocator) catch {}; }