Latest Zig SinglyLinkedList changes (#117)

Author: bobf

src/httpz.zig

@@ -246,6 +246,11 @@ pub fn Server(comptime H: type) type {
         middlewares: []const Middleware(H) = &.{},
     };
 
+    const MiddlewareItem = struct {
+        middleware: Middleware(H),
+        node: std.SinglyLinkedList.Node = .{},
+    };
+
     return struct {
         handler: H,
         config: Config,
@@ -259,7 +264,7 @@ pub fn Server(comptime H: type) type {
         _max_request_per_connection: usize,
         _middlewares: []const Middleware(H),
         _websocket_state: websocket.server.WorkerState,
-        _middleware_registry: std.SinglyLinkedList(Middleware(H)),
+        _middleware_registry: std.SinglyLinkedList,
 
         const Self = @This();
         const Worker = if (blockingMode()) worker.Blocking(*Self, WebsocketHandler) else worker.NonBlocking(*Self, WebsocketHandler);
@@ -325,7 +330,8 @@ pub fn Server(comptime H: type) type {
 
             var node = self._middleware_registry.first;
             while (node) |n| {
-                n.data.deinit();
+                const item: *MiddlewareItem = @fieldParentPtr("node", n);
+                item.middleware.deinit();
                 node = n.next;
             }
 
@@ -575,7 +581,7 @@ pub fn Server(comptime H: type) type {
         pub fn middleware(self: *Self, comptime M: type, config: M.Config) !Middleware(H) {
             const arena = self.arena;
 
-            const node = try arena.create(std.SinglyLinkedList(Middleware(H)).Node);
+            const node = try arena.create(MiddlewareItem);
             errdefer arena.destroy(node);
 
             const m = try arena.create(M);
@@ -590,8 +596,8 @@ pub fn Server(comptime H: type) type {
             }
 
             const iface = Middleware(H).init(m);
-            node.data = iface;
-            self._middleware_registry.prepend(node);
+            node.*.middleware = iface;
+            self._middleware_registry.prepend(&node.node);
 
             return iface;
         }