diff options
| -rw-r--r-- | lib/std/Io/Reader.zig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/std/Io/Reader.zig b/lib/std/Io/Reader.zig index 4cad73e8ce..7fda9a582c 100644 --- a/lib/std/Io/Reader.zig +++ b/lib/std/Io/Reader.zig @@ -1163,11 +1163,7 @@ pub inline fn takeStruct(r: *Reader, comptime T: type, endian: std.builtin.Endia .@"struct" => |info| switch (info.layout) { .auto => @compileError("ill-defined memory layout"), .@"extern" => { - // This code works around https://github.com/ziglang/zig/issues/25067 - // by avoiding a call to `peekStructPointer`. - const struct_bytes = try r.takeArray(@sizeOf(T)); - var res: T = undefined; - @memcpy(@as([]u8, @ptrCast(&res)), struct_bytes); + var res = (try r.takeStructPointer(T)).*; if (native_endian != endian) std.mem.byteSwapAllFields(T, &res); return res; }, @@ -1192,11 +1188,7 @@ pub inline fn peekStruct(r: *Reader, comptime T: type, endian: std.builtin.Endia .@"struct" => |info| switch (info.layout) { .auto => @compileError("ill-defined memory layout"), .@"extern" => { - // This code works around https://github.com/ziglang/zig/issues/25067 - // by avoiding a call to `peekStructPointer`. - const struct_bytes = try r.peekArray(@sizeOf(T)); - var res: T = undefined; - @memcpy(@as([]u8, @ptrCast(&res)), struct_bytes); + var res = (try r.peekStructPointer(T)).*; if (native_endian != endian) std.mem.byteSwapAllFields(T, &res); return res; }, |