aboutsummaryrefslogtreecommitdiff
path: root/std/json.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-06-26 18:29:19 -0400
committerGitHub <noreply@github.com>2019-06-26 18:29:19 -0400
commit01ff0d4d629c3800ebac68edfd91edb570aeaa59 (patch)
treefc1bdbf059e9bf9e99b212aae3056ed0e87e7e77 /std/json.zig
parent07c0d484eec327ca3bd1e3ce081c1ced230536a9 (diff)
parent517bdea7549453d958c31cf2af5dc298ea5508a9 (diff)
downloadzig-01ff0d4d629c3800ebac68edfd91edb570aeaa59.tar.gz
zig-01ff0d4d629c3800ebac68edfd91edb570aeaa59.zip
Merge pull request #2602 from ziglang/copy-elision-3
result location mechanism (part of no-copy semantics)
Diffstat (limited to 'std/json.zig')
-rw-r--r--std/json.zig3
1 files changed, 2 insertions, 1 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;