authorgravatar for ed.dean515@gmail.comEdward Dean <ed.dean515@gmail.com> 2021-04-04 10:34:34+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-04 17:04:46-07:00
log83a2665772578f6262afc858613023738a7d25ef
tree73fa61dcd465d7d4f61f50881d2241f398a4f665
parent7302b096bd6e4274080eab051f6f3e1ab49213b9

Fixed error types for GetSeekPosError

2 files changed, 5 insertions(+), 6 deletions(-)

lib/std/fs/file.zig+4-4
......@@ -223,15 +223,15 @@ pub const File = struct {
223223 return os.lseek_SET(self.handle, offset);
224224 }
225225
226 pub const GetPosError = os.SeekError || os.FStatError;
226 pub const GetSeekPosError = os.SeekError || os.FStatError;
227227
228228 /// TODO: integrate with async I/O
229 pub fn getPos(self: File) GetPosError!u64 {
229 pub fn getPos(self: File) GetSeekPosError!u64 {
230230 return os.lseek_CUR_get(self.handle);
231231 }
232232
233233 /// TODO: integrate with async I/O
234 pub fn getEndPos(self: File) GetPosError!u64 {
234 pub fn getEndPos(self: File) GetSeekPosError!u64 {
235235 if (builtin.os.tag == .windows) {
236236 return windows.GetFileSizeEx(self.handle);
237237 }
......@@ -819,7 +819,7 @@ pub const File = struct {
819819 pub const SeekableStream = io.SeekableStream(
820820 File,
821821 SeekError,
822 GetPosError,
822 GetSeekPosError,
823823 seekTo,
824824 seekBy,
825825 getPos,
lib/std/io/stream_source.zig+1-2
......@@ -5,7 +5,6 @@
55// and substantial portions of the software.
66const std = @import("../std.zig");
77const io = std.io;
8const testing = std.testing;
98
109/// Provides `io.Reader`, `io.Writer`, and `io.SeekableStream` for in-memory buffers as
1110/// well as files.
......@@ -19,7 +18,7 @@ pub const StreamSource = union(enum) {
1918 pub const ReadError = std.fs.File.ReadError;
2019 pub const WriteError = std.fs.File.WriteError;
2120 pub const SeekError = std.fs.File.SeekError;
22 pub const GetSeekPosError = std.fs.File.GetPosError;
21 pub const GetSeekPosError = std.fs.File.GetSeekPosError;
2322
2423 pub const Reader = io.Reader(*StreamSource, ReadError, read);
2524 pub const Writer = io.Writer(*StreamSource, WriteError, write);