| 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 |
std: Remove now-superflous hack
2 files changed, 3 insertions(+), 9 deletions(-)
lib- std
lib/std/json.zig+1-3
| ... | ... | @@ -1026,10 +1026,8 @@ pub const TokenStream = struct { |
| 1026 | 1026 | |
| 1027 | 1027 | pub fn next(self: *TokenStream) Error!?Token { |
| 1028 | 1028 | if (self.token) |token| { |
| 1029 | // TODO: Audit this pattern once #2915 is closed | |
| 1030 | const copy = token; | |
| 1031 | 1029 | self.token = null; |
| 1032 | return copy; | |
| 1030 | return token; | |
| 1033 | 1031 | } |
| 1034 | 1032 | |
| 1035 | 1033 | var t1: ?Token = undefined; |
lib/std/zig/tokenizer.zig+2-6
| ... | ... | @@ -414,10 +414,8 @@ pub const Tokenizer = struct { |
| 414 | 414 | |
| 415 | 415 | pub fn next(self: *Tokenizer) Token { |
| 416 | 416 | if (self.pending_invalid_token) |token| { |
| 417 | // TODO: Audit this pattern once #2915 is closed | |
| 418 | const copy = token; | |
| 419 | 417 | self.pending_invalid_token = null; |
| 420 | return copy; | |
| 418 | return token; | |
| 421 | 419 | } |
| 422 | 420 | const start_index = self.index; |
| 423 | 421 | var state = State.Start; |
| ... | ... | @@ -1270,10 +1268,8 @@ pub const Tokenizer = struct { |
| 1270 | 1268 | |
| 1271 | 1269 | if (result.id == Token.Id.Eof) { |
| 1272 | 1270 | if (self.pending_invalid_token) |token| { |
| 1273 | // TODO: Audit this pattern once #2915 is closed | |
| 1274 | const copy = token; | |
| 1275 | 1271 | self.pending_invalid_token = null; |
| 1276 | return copy; | |
| 1272 | return token; | |
| 1277 | 1273 | } |
| 1278 | 1274 | } |
| 1279 | 1275 |