mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

DeprecatedReader.Adapted: fix EndOfStream handling

Browse Source
This commit is contained in:
Kendall Condon 2025-07-28 19:13:22 -04:00 committed by Andrew Kelley
parent 147a852806
commit ecd3ea9bd2
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/std/Io.zig
View File

@ -333,6 +333,7 @@ pub fn GenericReader(
a.err = err; a.err = err;
return error.ReadFailed; return error.ReadFailed;
}; };
if (n == 0) return error.EndOfStream;
w.advance(n); w.advance(n);
return n; return n;
} }

1
lib/std/Io/DeprecatedReader.zig
View File

@ -397,6 +397,7 @@ pub const Adapter = struct {
a.err = err; a.err = err;
return error.ReadFailed; return error.ReadFailed;
}; };
if (n == 0) return error.EndOfStream;
w.advance(n); w.advance(n);
return n; return n;
} }

8
lib/std/Io/test.zig
View File

@ -180,3 +180,11 @@ test "GenericReader methods can return error.EndOfStream" {
fbs.reader().isBytes("foo"), fbs.reader().isBytes("foo"),
); );
} }
test "Adapted DeprecatedReader EndOfStream" {
var fbs: io.FixedBufferStream([]const u8) = .{ .buffer = &.{}, .pos = 0 };
const reader = fbs.reader();
var buf: [1]u8 = undefined;
var adapted = reader.adaptToNewApi(&buf);
try std.testing.expectError(error.EndOfStream, adapted.new_interface.takeByte());
}