Merge branch 'master' into modernize-stage2

2019-11-23 23:01:28 +02:00 · 2019-11-23 23:01:28 +02:00 · 89310dad56
commit 89310dad56
parent b9ef36094c 29d7b5a80c
2 changed files with 2 additions and 2 deletions
--- a/lib/std/event/future.zig
+++ b/lib/std/event/future.zig
@ -26,7 +26,7 @@ pub fn Future(comptime T: type) type {
        pub fn init() Self {
            return Self{
                .lock = Lock.initLocked(),
-                .available = 0,
+                .available = .NotStarted,
                .data = undefined,
            };
        }
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) 2015 Andrew Kelley
 *
 * This file is part of zig, which is MIT licensed.