From 7fa59565d31d4bd62e7c1250bb6c8aeda83429e6 Mon Sep 17 00:00:00 2001 From: Vexu <15308111+Vexu@users.noreply.github.com> Date: Sat, 23 Nov 2019 20:18:38 +0200 Subject: [PATCH 1/2] fix small regressions in std.event --- lib/std/event/future.zig | 2 +- lib/std/event/group.zig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/std/event/future.zig b/lib/std/event/future.zig index 5261db990c8cd5e90e94b257889192bc99467ab2..492582da75c5948c721b775d42a1fd07a7fd4be0 100644 --- 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, }; } diff --git a/lib/std/event/group.zig b/lib/std/event/group.zig index 77dd2cd1aaf474182e9e3507db103095072a64ea..2b26a500ddafc9d162f3cea8e601e1b7da10bc81 100644 --- a/lib/std/event/group.zig +++ b/lib/std/event/group.zig @@ -67,10 +67,10 @@ pub fn Group(comptime ReturnType: type) type { .next = undefined, .data = Node{ .handle = frame, - .bytes = @sliceToBytes((*[1]@Frame(func))(frame)[0..]), + .bytes = std.mem.asBytes(frame), }, }; - frame.* = async func(args); + _ = @asyncCall(frame, {}, func, args); self.alloc_stack.push(node); } -- 2.54.0 From 29d7b5a80c9faf640c3db0de14cd229e90b2d8c3 Mon Sep 17 00:00:00 2001 From: Michael Dusan Date: Sat, 23 Nov 2019 12:07:39 -0500 Subject: [PATCH 2/2] remove UTF BOM --- src/analyze.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/analyze.cpp b/src/analyze.cpp index 0a8b32dca7b6ebde8e4a359fca345c32b1e925a9..d8c2d29486b36b8fe75ca3e9e5aec4fb0515d01b 100644 --- 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. -- 2.54.0