aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-06-22 18:54:27 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-06-22 18:54:27 -0400
commit2b1695b1b03b42719f02c4ed4d4b5d3495a2ca3a (patch)
tree0dbf08cb21bd694aac8899e363c6d1bf20cc04bc /std
parent86f362ce8e878188d40393e6f2feba0c60ddbcf0 (diff)
downloadzig-2b1695b1b03b42719f02c4ed4d4b5d3495a2ca3a.tar.gz
zig-2b1695b1b03b42719f02c4ed4d4b5d3495a2ca3a.zip
fix std.json regression
Diffstat (limited to 'std')
-rw-r--r--std/json.zig3
-rw-r--r--std/std.zig2
2 files changed, 3 insertions, 2 deletions
diff --git a/std/json.zig b/std/json.zig
index 8d42d1bcf0..e135911170 100644
--- a/std/json.zig
+++ b/std/json.zig
@@ -876,8 +876,9 @@ pub const TokenStream = struct {
pub fn next(self: *TokenStream) !?Token {
if (self.token) |token| {
+ const copy = token;
self.token = null;
- return token;
+ return copy;
}
var t1: ?Token = undefined;
diff --git a/std/std.zig b/std/std.zig
index 6ce864fa26..733089f834 100644
--- a/std/std.zig
+++ b/std/std.zig
@@ -90,7 +90,7 @@ test "std" {
_ = @import("hash.zig");
_ = @import("heap.zig");
_ = @import("io.zig");
- //_ = @import("json.zig");
+ _ = @import("json.zig");
//_ = @import("lazy_init.zig");
_ = @import("macho.zig");
_ = @import("math.zig");