authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2024-05-29 12:00:04 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2024-05-29 12:00:04 -07:00
logc8a011f8ce0799001a7d3d1ed15dec21afdb1f44
treecd6b51bcc82965e3cdd32ee82c5496f79e5e73cb
parentdc83c8ece0399da8df86248fde91d48dd55076eb

use stdlib AnyReader

1 files changed, 3 insertions(+), 3 deletions(-)

json.zig+3-3
...@@ -13,7 +13,7 @@ pub fn parse(alloc: std.mem.Allocator, path: string, inreader: anytype) anyerror...@@ -13,7 +13,7 @@ pub fn parse(alloc: std.mem.Allocator, path: string, inreader: anytype) anyerror
13 _ = path;13 _ = path;
1414
15 var counter = std.io.countingReader(inreader);15 var counter = std.io.countingReader(inreader);
16 const anyreader = extras.AnyReader.from(counter.reader());16 const anyreader = counter.reader().any();
17 var p = Parser.init(alloc, anyreader);17 var p = Parser.init(alloc, anyreader);
18 defer p.temp.deinit(alloc);18 defer p.temp.deinit(alloc);
19 defer p.strings_map.deinit(alloc);19 defer p.strings_map.deinit(alloc);
...@@ -223,7 +223,7 @@ fn parseWs(p: *Parser) !void {...@@ -223,7 +223,7 @@ fn parseWs(p: *Parser) !void {
223}223}
224224
225const Parser = struct {225const Parser = struct {
226 any: extras.AnyReader,226 any: std.io.AnyReader,
227 arena: std.mem.Allocator,227 arena: std.mem.Allocator,
228 temp: std.ArrayListUnmanaged(u8) = .{},228 temp: std.ArrayListUnmanaged(u8) = .{},
229 idx: usize = 0,229 idx: usize = 0,
...@@ -233,7 +233,7 @@ const Parser = struct {...@@ -233,7 +233,7 @@ const Parser = struct {
233 extras: std.ArrayListUnmanaged(u8) = .{},233 extras: std.ArrayListUnmanaged(u8) = .{},
234 strings_map: std.StringArrayHashMapUnmanaged(StringIndex) = .{},234 strings_map: std.StringArrayHashMapUnmanaged(StringIndex) = .{},
235235
236 pub fn init(allocator: std.mem.Allocator, any: extras.AnyReader) Parser {236 pub fn init(allocator: std.mem.Allocator, any: std.io.AnyReader) Parser {
237 return .{237 return .{
238 .any = any,238 .any = any,
239 .arena = allocator,239 .arena = allocator,