Commit 59a243ce24e858260d289c5c40f3430223b7d98b | zig

author	LemonBoy <thatlemon@gmail.com> 2020-02-15 21:33:59+01:00
committer	LemonBoy <thatlemon@gmail.com> 2020-02-16 19:53:53+01:00
log	59a243ce24e858260d289c5c40f3430223b7d98b
tree	14af6f6b38caca591ff8d1fa76330137b3c4b327
parent	096f79260b025ab53d77c4943f237676abb5b7d8

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

lib/std/json.zig+1-3

 @@ -1026,10 +1026,8 @@ pub const TokenStream = struct {
     pub fn next(self: *TokenStream) Error!?Token {
         if (self.token) |token| {
-            // TODO: Audit this pattern once #2915 is closed
-            const copy = token;
             self.token = null;
-            return copy;
+            return token;
         }
         var t1: ?Token = undefined;

lib/std/zig/tokenizer.zig+2-6

 @@ -414,10 +414,8 @@ pub const Tokenizer = struct {
     pub fn next(self: *Tokenizer) Token {
         if (self.pending_invalid_token) |token| {
-            // TODO: Audit this pattern once #2915 is closed
-            const copy = token;
             self.pending_invalid_token = null;
-            return copy;
+            return token;
         }
         const start_index = self.index;
         var state = State.Start;
 @@ -1270,10 +1268,8 @@ pub const Tokenizer = struct {
         if (result.id == Token.Id.Eof) {
             if (self.pending_invalid_token) |token| {
-                // TODO: Audit this pattern once #2915 is closed
-                const copy = token;
                 self.pending_invalid_token = null;
-                return copy;
+                return token;
             }
         }