authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-12-19 17:48:21-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-12-19 17:48:21-05:00
log8768816d69ddf3253d2598923643f390cc18082c
tree8e2962aa68bacc59a0253a9d039759b20de639b0
parenta7670e80a49021fb96d1f9a1bbcbcfc6c1e835ab
signaturelock-open Commit is signed but in an unrecognized format.

std.io: call the idiomatic std.mem.readInt functions

I originally called the Slice variants to work around comptime code not supporting `@ptrCast`, but I fixed that in 757d0665 so now the workaround is no longer needed.

1 files changed, 5 insertions(+), 5 deletions(-)

std/io.zig+5-5
...@@ -155,32 +155,32 @@ pub fn InStream(comptime ReadError: type) type {...@@ -155,32 +155,32 @@ pub fn InStream(comptime ReadError: type) type {
155 pub fn readIntNative(self: *Self, comptime T: type) !T {155 pub fn readIntNative(self: *Self, comptime T: type) !T {
156 var bytes: [@sizeOf(T)]u8 = undefined;156 var bytes: [@sizeOf(T)]u8 = undefined;
157 try self.readNoEof(bytes[0..]);157 try self.readNoEof(bytes[0..]);
158 return mem.readIntSliceNative(T, bytes);158 return mem.readIntNative(T, &bytes);
159 }159 }
160160
161 /// Reads a foreign-endian integer161 /// Reads a foreign-endian integer
162 pub fn readIntForeign(self: *Self, comptime T: type) !T {162 pub fn readIntForeign(self: *Self, comptime T: type) !T {
163 var bytes: [@sizeOf(T)]u8 = undefined;163 var bytes: [@sizeOf(T)]u8 = undefined;
164 try self.readNoEof(bytes[0..]);164 try self.readNoEof(bytes[0..]);
165 return mem.readIntSliceForeign(T, bytes);165 return mem.readIntForeign(T, &bytes);
166 }166 }
167167
168 pub fn readIntLittle(self: *Self, comptime T: type) !T {168 pub fn readIntLittle(self: *Self, comptime T: type) !T {
169 var bytes: [@sizeOf(T)]u8 = undefined;169 var bytes: [@sizeOf(T)]u8 = undefined;
170 try self.readNoEof(bytes[0..]);170 try self.readNoEof(bytes[0..]);
171 return mem.readIntSliceLittle(T, bytes);171 return mem.readIntLittle(T, &bytes);
172 }172 }
173173
174 pub fn readIntBig(self: *Self, comptime T: type) !T {174 pub fn readIntBig(self: *Self, comptime T: type) !T {
175 var bytes: [@sizeOf(T)]u8 = undefined;175 var bytes: [@sizeOf(T)]u8 = undefined;
176 try self.readNoEof(bytes[0..]);176 try self.readNoEof(bytes[0..]);
177 return mem.readIntSliceBig(T, bytes);177 return mem.readIntBig(T, &bytes);
178 }178 }
179179
180 pub fn readInt(self: *Self, comptime T: type, endian: builtin.Endian) !T {180 pub fn readInt(self: *Self, comptime T: type, endian: builtin.Endian) !T {
181 var bytes: [@sizeOf(T)]u8 = undefined;181 var bytes: [@sizeOf(T)]u8 = undefined;
182 try self.readNoEof(bytes[0..]);182 try self.readNoEof(bytes[0..]);
183 return mem.readIntSlice(T, bytes, endian);183 return mem.readInt(T, &bytes, endian);
184 }184 }
185185
186 pub fn readVarInt(self: *Self, comptime ReturnType: type, endian: builtin.Endian, size: usize) !ReturnType {186 pub fn readVarInt(self: *Self, comptime ReturnType: type, endian: builtin.Endian, size: usize) !ReturnType {