From 5b10d9f917ac773ca7c842d74ef44c861484670f Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Sat, 8 Feb 2020 16:24:26 -0500
Subject: [PATCH] std: fix bitrotted evented code

---
 lib/std/event/channel.zig | 7 +++----
 lib/std/event/group.zig   | 2 +-
 lib/std/event/lock.zig    | 8 ++++----
 lib/std/fs/watch.zig      | 5 ++---
 lib/std/net/test.zig      | 8 +++-----
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/std/event/channel.zig b/lib/std/event/channel.zig
index 2bcf6a4c50..fd70f73aab 100644
--- a/lib/std/event/channel.zig
+++ b/lib/std/event/channel.zig
@@ -267,17 +267,16 @@ pub fn Channel(comptime T: type) type {
 }
 
 test "std.event.Channel" {
+    if (!std.io.is_async) return error.SkipZigTest;
+
     // https://github.com/ziglang/zig/issues/1908
     if (builtin.single_threaded) return error.SkipZigTest;
 
     // https://github.com/ziglang/zig/issues/3251
     if (builtin.os == .freebsd) return error.SkipZigTest;
 
-    // TODO provide a way to run tests in evented I/O mode
-    if (!std.io.is_async) return error.SkipZigTest;
-
     var channel: Channel(i32) = undefined;
-    channel.init([0]i32{});
+    channel.init(&[0]i32{});
     defer channel.deinit();
 
     var handle = async testChannelGetter(&channel);
diff --git a/lib/std/event/group.zig b/lib/std/event/group.zig
index 2668096615..98ebdbd1f8 100644
--- a/lib/std/event/group.zig
+++ b/lib/std/event/group.zig
@@ -22,7 +22,7 @@ pub fn Group(comptime ReturnType: type) type {
         const AllocStack = std.atomic.Stack(Node);
 
         pub const Node = struct {
-            bytes: []const u8 = [0]u8{},
+            bytes: []const u8 = &[0]u8{},
             handle: anyframe->ReturnType,
         };
 
diff --git a/lib/std/event/lock.zig b/lib/std/event/lock.zig
index a95c5bf7e2..e1b3495e5c 100644
--- a/lib/std/event/lock.zig
+++ b/lib/std/event/lock.zig
@@ -117,21 +117,21 @@ pub const Lock = struct {
 };
 
 test "std.event.Lock" {
+    if (!std.io.is_async) return error.SkipZigTest;
+
     // TODO https://github.com/ziglang/zig/issues/1908
     if (builtin.single_threaded) return error.SkipZigTest;
 
     // TODO https://github.com/ziglang/zig/issues/3251
     if (builtin.os == .freebsd) return error.SkipZigTest;
 
-    // TODO provide a way to run tests in evented I/O mode
-    if (!std.io.is_async) return error.SkipZigTest;
-
     var lock = Lock.init();
     defer lock.deinit();
 
     _ = async testLock(&lock);
 
-    testing.expectEqualSlices(i32, [1]i32{3 * @intCast(i32, shared_test_data.len)} ** shared_test_data.len, shared_test_data);
+    const expected_result = [1]i32{3 * @intCast(i32, shared_test_data.len)} ** shared_test_data.len;
+    testing.expectEqualSlices(i32, &expected_result, &shared_test_data);
 }
 
 async fn testLock(lock: *Lock) void {
diff --git a/lib/std/fs/watch.zig b/lib/std/fs/watch.zig
index d7a298aa5d..c904f110e2 100644
--- a/lib/std/fs/watch.zig
+++ b/lib/std/fs/watch.zig
@@ -615,12 +615,11 @@ pub fn Watch(comptime V: type) type {
 const test_tmp_dir = "std_event_fs_test";
 
 test "write a file, watch it, write it again" {
-    // TODO provide a way to run tests in evented I/O mode
-    if (!std.io.is_async) return error.SkipZigTest;
+    // TODO re-enable this test
+    if (true) return error.SkipZigTest;
 
     const allocator = std.heap.page_allocator;
 
-    // TODO move this into event loop too
     try os.makePath(allocator, test_tmp_dir);
     defer os.deleteTree(test_tmp_dir) catch {};
 
diff --git a/lib/std/net/test.zig b/lib/std/net/test.zig
index 2dd11b391e..703a804bfb 100644
--- a/lib/std/net/test.zig
+++ b/lib/std/net/test.zig
@@ -81,17 +81,15 @@ test "resolve DNS" {
 }
 
 test "listen on a port, send bytes, receive bytes" {
+    if (!std.io.is_async) return error.SkipZigTest;
+
     if (std.builtin.os != .linux) {
         // TODO build abstractions for other operating systems
         return error.SkipZigTest;
     }
-    if (std.io.mode != .evented) {
-        // TODO add ability to run tests in non-blocking I/O mode
-        return error.SkipZigTest;
-    }
 
     // TODO doing this at comptime crashed the compiler
-    const localhost = net.Address.parseIp("127.0.0.1", 0);
+    const localhost = try net.Address.parseIp("127.0.0.1", 0);
 
     var server = net.StreamServer.init(net.StreamServer.Options{});
     defer server.deinit();