Merge remote-tracking branch 'origin/master' into copy-elision-3

2 files changed, 2 insertions, 2 deletions

diff --git a/std/event/fs.zig b/std/event/fs.zig
index 7a6a5861b2..b48f8723c1 100644
--- a/std/event/fs.zig
+++ b/std/event/fs.zig
@@ -887,7 +887,7 @@ pub fn Watch(comptime V: type) type {
         }
 
         async fn addFileKEvent(self: *Self, file_path: []const u8, value: V) !?V {
-            const resolved_path = try std.fs.path.resolve(self.channel.loop.allocator, [][]const u8{file_path});
+            const resolved_path = try std.fs.path.resolve(self.channel.loop.allocator, [_][]const u8{file_path});
             var resolved_path_consumed = false;
             defer if (!resolved_path_consumed) self.channel.loop.allocator.free(resolved_path);
 
diff --git a/std/event/net.zig b/std/event/net.zig
index f4398196e3..413bf1432c 100644
--- a/std/event/net.zig
+++ b/std/event/net.zig
@@ -19,7 +19,7 @@ pub const Server = struct {
     waiting_for_emfile_node: PromiseNode,
     listen_resume_node: event.Loop.ResumeNode,
 
-    const PromiseNode = std.LinkedList(promise).Node;
+    const PromiseNode = std.TailQueue(promise).Node;
 
     pub fn init(loop: *Loop) Server {
         // TODO can't initialize handler coroutine here because we need well defined copy elision