mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.Io.Reader: update OneByteReader usage to std.testing.Reader

Browse source
This commit is contained in:
Andrew Kelley 2025-07-16 23:02:39 -07:00
parent b7d7446fbb
commit 86699acbb9
2 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/std/Io/Reader.zig
View file

@ -1702,33 +1702,13 @@ fn failingDiscard(r: *Reader, limit: Limit) Error!usize {
} }
test "readAlloc when the backing reader provides one byte at a time" { test "readAlloc when the backing reader provides one byte at a time" {
const OneByteReader = struct {
str: []const u8,
i: usize,
reader: Reader,
fn stream(r: *Reader, w: *Writer, limit: Limit) StreamError!usize {
assert(@intFromEnum(limit) >= 1);
const self: *@This() = @fieldParentPtr("reader", r);
if (self.str.len - self.i == 0) return error.EndOfStream;
try w.writeByte(self.str[self.i]);
self.i += 1;
return 1;
}
};
const str = "This is a test"; const str = "This is a test";
var tiny_buffer: [1]u8 = undefined; var tiny_buffer: [1]u8 = undefined;
var one_byte_stream: OneByteReader = .{ var one_byte_stream: testing.Reader = .init(&tiny_buffer, &.{
.str = str, .{ .buffer = str },
.i = 0, });
.reader = .{ one_byte_stream.artificial_limit = .limited(1);
.buffer = &tiny_buffer, const res = try one_byte_stream.interface.allocRemaining(std.testing.allocator, .unlimited);
.vtable = &.{ .stream = OneByteReader.stream },
.seek = 0,
.end = 0,
},
};
const res = try one_byte_stream.reader.allocRemaining(std.testing.allocator, .unlimited);
defer std.testing.allocator.free(res); defer std.testing.allocator.free(res);
try std.testing.expectEqualStrings(str, res); try std.testing.expectEqualStrings(str, res);
} }

10
lib/std/testing.zig
View file

@ -1207,12 +1207,14 @@ pub inline fn fuzz(
return @import("root").fuzz(context, testOne, options); return @import("root").fuzz(context, testOne, options);
} }
/// A `std.io.Reader` that writes a predetermined list of buffers during `stream`. /// A `std.Io.Reader` that writes a predetermined list of buffers during `stream`.
pub const Reader = struct { pub const Reader = struct {
calls: []const Call, calls: []const Call,
interface: std.io.Reader, interface: std.Io.Reader,
next_call_index: usize, next_call_index: usize,
next_offset: usize, next_offset: usize,
/// Further reduces how many bytes are written in each `stream` call.
artificial_limit: std.Io.Limit = .unlimited,
pub const Call = struct { pub const Call = struct {
buffer: []const u8, buffer: []const u8,
@ -1232,11 +1234,11 @@ pub const Reader = struct {
}; };
} }
fn stream(io_r: *std.io.Reader, w: *std.io.Writer, limit: std.io.Limit) std.io.Reader.StreamError!usize { fn stream(io_r: *std.Io.Reader, w: *std.Io.Writer, limit: std.Io.Limit) std.Io.Reader.StreamError!usize {
const r: *Reader = @alignCast(@fieldParentPtr("interface", io_r)); const r: *Reader = @alignCast(@fieldParentPtr("interface", io_r));
if (r.calls.len - r.next_call_index == 0) return error.EndOfStream; if (r.calls.len - r.next_call_index == 0) return error.EndOfStream;
const call = r.calls[r.next_call_index]; const call = r.calls[r.next_call_index];
const buffer = limit.sliceConst(call.buffer[r.next_offset..]); const buffer = r.artificial_limit.sliceConst(limit.sliceConst(call.buffer[r.next_offset..]));
const n = try w.write(buffer); const n = try w.write(buffer);
r.next_offset += n; r.next_offset += n;
if (call.buffer.len - r.next_offset == 0) { if (call.buffer.len - r.next_offset == 0) {