Properly initialize the SaprusMessage fromBytes

Will actually use the provided packet type inline.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/main.zig b/src/main.zig
index b4ae666..951666f 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -84,7 +84,13 @@ const SaprusMessage = union(SaprusPacketType) {
     }
 };
 
-inline fn toBytesAux(comptime Header: type, header: Header, payload: []const u8, w: std.ArrayList(u8).Writer, allocator: Allocator) !void {
+inline fn toBytesAux(
+    comptime Header: type,
+    header: Header,
+    payload: []const u8,
+    w: std.ArrayList(u8).Writer,
+    allocator: Allocator,
+) !void {
     const payload_list = try encodeToList(payload, allocator);
     defer payload_list.deinit();
 
@@ -93,26 +99,20 @@ inline fn toBytesAux(comptime Header: type, header: Header, payload: []const u8,
     try w.writeAll(payload_list.items);
 }
 
-inline fn fromBytesAux(comptime Packet: SaprusPacketType, comptime Header: type, r: StringReader, allocator: Allocator) !SaprusMessage {
+inline fn fromBytesAux(
+    comptime packet: SaprusPacketType,
+    comptime Header: type,
+    r: StringReader,
+    allocator: Allocator,
+) !SaprusMessage {
     const header = try r.readStructEndian(Header, .big);
     const len = try r.readInt(u16, .big);
     const payload = try decodeFromReader(r, len, allocator);
 
-    return switch (Packet) {
-        .relay => SaprusMessage{
-            .relay = .{
-                .header = header,
-                .payload = payload,
-            },
-        },
-        .connection => SaprusMessage{
-            .connection = .{
-                .header = header,
-                .payload = payload,
-            },
-        },
-        else => unreachable,
-    };
+    return @unionInit(SaprusMessage, @tagName(packet), .{
+        .header = header,
+        .payload = payload,
+    });
 }
 
 pub fn main() !void {