Commit 59a243ce24

LemonBoy <thatlemon@gmail.com>
2020-02-15 21:33:59
std: Remove now-superflous hack
1 parent 096f792
Changed files (2)
lib/std/zig/tokenizer.zig
@@ -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;
             }
         }
 
lib/std/json.zig
@@ -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;