authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-22 18:54:27-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-22 18:54:27-04:00
log2b1695b1b03b42719f02c4ed4d4b5d3495a2ca3a
tree0dbf08cb21bd694aac8899e363c6d1bf20cc04bc
parent86f362ce8e878188d40393e6f2feba0c60ddbcf0
signature Commit is signed but in an unrecognized format.

fix std.json regression


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

std/json.zig+2-1
...@@ -876,8 +876,9 @@ pub const TokenStream = struct {...@@ -876,8 +876,9 @@ pub const TokenStream = struct {
876876
877 pub fn next(self: *TokenStream) !?Token {877 pub fn next(self: *TokenStream) !?Token {
878 if (self.token) |token| {878 if (self.token) |token| {
879 const copy = token;
879 self.token = null;880 self.token = null;
880 return token;881 return copy;
881 }882 }
882883
883 var t1: ?Token = undefined;884 var t1: ?Token = undefined;
std/std.zig+1-1
...@@ -90,7 +90,7 @@ test "std" {...@@ -90,7 +90,7 @@ test "std" {
90 _ = @import("hash.zig");90 _ = @import("hash.zig");
91 _ = @import("heap.zig");91 _ = @import("heap.zig");
92 _ = @import("io.zig");92 _ = @import("io.zig");
93 //_ = @import("json.zig");93 _ = @import("json.zig");
94 //_ = @import("lazy_init.zig");94 //_ = @import("lazy_init.zig");
95 _ = @import("macho.zig");95 _ = @import("macho.zig");
96 _ = @import("math.zig");96 _ = @import("math.zig");