authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-11-23 23:01:28+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2019-11-23 23:01:28+02:00
log89310dad561357b687316bc849594485d55a47ef
treea737bb1cd3af6c2d5c82c05cf832363a59b50d1a
parentb9ef36094c9ffc522def982c98abcb97cd067761
parent29d7b5a80c9faf640c3db0de14cd229e90b2d8c3
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge branch 'master' into modernize-stage2

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

lib/std/event/future.zig+1-1
...@@ -26,7 +26,7 @@ pub fn Future(comptime T: type) type {...@@ -26,7 +26,7 @@ pub fn Future(comptime T: type) type {
26 pub fn init() Self {26 pub fn init() Self {
27 return Self{27 return Self{
28 .lock = Lock.initLocked(),28 .lock = Lock.initLocked(),
29 .available = 0,29 .available = .NotStarted,
30 .data = undefined,30 .data = undefined,
31 };31 };
32 }32 }
src/analyze.cpp+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*1/*
2 * Copyright (c) 2015 Andrew Kelley2 * Copyright (c) 2015 Andrew Kelley
3 *3 *
4 * This file is part of zig, which is MIT licensed.4 * This file is part of zig, which is MIT licensed.