Update to new json api

fabioarnold · May 22, 2023 · 2d89fa5 · 2d89fa5
1 parent c128403
commit 2d89fa5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ProcessAssetsStep.zig b/ProcessAssetsStep.zig
@@ -81,9 +81,7 @@ fn loadJson(comptime T: type, path: []const u8, allocator: std.mem.Allocator) !T
     defer file.close();
     const file_contents = try file.readToEndAlloc(allocator, max_file_size);
     defer allocator.free(file_contents);
-    var ts = std.json.TokenStream.init(file_contents);
-    return try std.json.parse(T, &ts, .{
-        .allocator = allocator,
+    return std.json.parseFromSlice(T, allocator, file_contents, .{
         .ignore_unknown_fields = true,
     });
 }

diff --git a/src/main.zig b/src/main.zig
@@ -140,9 +140,11 @@ pub const GameData = struct {
     }
 
     fn loadSnapshot(self: *GameData) void {
+        var buffer: [1000]u8 = undefined;
+        var fba = std.heap.FixedBufferAllocator.init(&buffer);
+        const allocator = fba.allocator();
         const value = web.LocalStorage.getString("snapshot");
-        var ts = std.json.TokenStream.init(value);
-        self.* = std.json.parse(GameData, &ts, .{
+        self.* = std.json.parseFromSlice(GameData, allocator, value, .{
             .ignore_unknown_fields = true,
         }) catch unreachable;
         uploadRoomTexture(&cur_room_tex, self.getCurrentRoom()); // FIXME