authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-05-28 15:44:42-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:29-07:00
log2f5574ac083a4a14ab603b7f848d135fbba3c1ed
treef252762299f18d7b20bdfb89db355a90bc948497
parent3ef75356f6f5f1be170006c122c16df56961cf15

std: finish renaming RwError to StreamError

13 files changed, 27 insertions(+), 61 deletions(-)

lib/std/compress/flate/Compress.zig+1-1
......@@ -769,7 +769,7 @@ fn read(
769769 context: ?*anyopaque,
770770 bw: *std.io.BufferedWriter,
771771 limit: std.io.Limit,
772) std.io.Reader.RwError!usize {
772) std.io.Reader.StreamError!usize {
773773 const c: *Compress = @ptrCast(@alignCast(context));
774774 switch (c.state) {
775775 .header => |i| {
lib/std/compress/flate/Decompress.zig+1-1
......@@ -143,7 +143,7 @@ pub fn read(
143143 context: ?*anyopaque,
144144 bw: *std.io.BufferedWriter,
145145 limit: std.io.Limit,
146) std.io.Reader.RwError!usize {
146) std.io.Reader.StreamError!usize {
147147 const d: *Decompress = @alignCast(@ptrCast(context));
148148 return readInner(d, bw, limit) catch |err| switch (err) {
149149 error.EndOfStream => return error.EndOfStream,
lib/std/compress/lzma2.zig+1-1
......@@ -2,7 +2,7 @@ const std = @import("../std.zig");
22const Allocator = std.mem.Allocator;
33const lzma = std.compress.lzma;
44
5pub fn decompress(gpa: Allocator, reader: *std.io.BufferedReader, writer: *std.io.BufferedWriter) std.io.Reader.RwError!void {
5pub fn decompress(gpa: Allocator, reader: *std.io.BufferedReader, writer: *std.io.BufferedWriter) std.io.Reader.StreamError!void {
66 var decoder = try Decode.init(gpa);
77 defer decoder.deinit(gpa);
88 return decoder.decompress(gpa, reader, writer);
lib/std/compress/zstd/Decompress.zig+1-1
......@@ -78,7 +78,7 @@ pub fn reader(self: *Decompress) Reader {
7878 };
7979}
8080
81fn read(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.RwError!usize {
81fn read(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.StreamError!usize {
8282 const d: *Decompress = @ptrCast(@alignCast(context));
8383 const in = d.input;
8484
lib/std/crypto/tls/Client.zig+1-1
......@@ -1043,7 +1043,7 @@ pub fn eof(c: Client) bool {
10431043 return c.received_close_notify;
10441044}
10451045
1046fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) Reader.RwError!usize {
1046fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) Reader.StreamError!usize {
10471047 const c: *Client = @ptrCast(@alignCast(context));
10481048 if (c.eof()) return error.EndOfStream;
10491049 const input = c.input;
lib/std/http.zig+3-3
......@@ -508,7 +508,7 @@ pub const Reader = struct {
508508 ctx: ?*anyopaque,
509509 bw: *std.io.BufferedWriter,
510510 limit: std.io.Limit,
511 ) std.io.Reader.RwError!usize {
511 ) std.io.Reader.StreamError!usize {
512512 const reader: *Reader = @alignCast(@ptrCast(ctx));
513513 const remaining_content_length = &reader.state.body_remaining_content_length;
514514 const remaining = remaining_content_length.*;
......@@ -551,7 +551,7 @@ pub const Reader = struct {
551551 ctx: ?*anyopaque,
552552 bw: *std.io.BufferedWriter,
553553 limit: std.io.Limit,
554 ) std.io.Reader.RwError!usize {
554 ) std.io.Reader.StreamError!usize {
555555 const reader: *Reader = @alignCast(@ptrCast(ctx));
556556 const chunk_len_ptr = switch (reader.state) {
557557 .ready => return error.EndOfStream,
......@@ -577,7 +577,7 @@ pub const Reader = struct {
577577 bw: *std.io.BufferedWriter,
578578 limit: std.io.Limit,
579579 chunk_len_ptr: *RemainingChunkLen,
580 ) (BodyError || std.io.Reader.RwError)!usize {
580 ) (BodyError || std.io.Reader.StreamError)!usize {
581581 const in = reader.in;
582582 len: switch (chunk_len_ptr.*) {
583583 .head => {
lib/std/io/BufferedReader.zig+4-4
......@@ -104,7 +104,7 @@ pub fn readAll(br: *BufferedReader, bw: *BufferedWriter, limit: Limit) Reader.St
104104/// a success case.
105105///
106106/// Returns total number of bytes written to `bw`.
107pub fn readRemaining(br: *BufferedReader, bw: *BufferedWriter) Reader.RwRemainingError!usize {
107pub fn readRemaining(br: *BufferedReader, bw: *BufferedWriter) Reader.StreamRemainingError!usize {
108108 var offset: usize = 0;
109109 while (true) {
110110 offset += br.read(bw, .unlimited) catch |err| switch (err) {
......@@ -720,7 +720,7 @@ pub fn readDelimiterEnding(
720720 br: *BufferedReader,
721721 bw: *BufferedWriter,
722722 delimiter: u8,
723) Reader.RwRemainingError!usize {
723) Reader.StreamRemainingError!usize {
724724 const amount, const to = try br.readAny(bw, delimiter, .unlimited);
725725 return switch (to) {
726726 .delimiter, .end => amount,
......@@ -728,7 +728,7 @@ pub fn readDelimiterEnding(
728728 };
729729}
730730
731pub const StreamDelimiterLimitedError = Reader.RwRemainingError || error{
731pub const StreamDelimiterLimitedError = Reader.StreamRemainingError || error{
732732 /// Stream ended before the delimiter was found.
733733 EndOfStream,
734734 /// The delimiter was not found within the limit.
......@@ -758,7 +758,7 @@ fn readAny(
758758 bw: *BufferedWriter,
759759 delimiter: ?u8,
760760 limit: Limit,
761) Reader.RwRemainingError!struct { usize, enum { delimiter, limit, end } } {
761) Reader.StreamRemainingError!struct { usize, enum { delimiter, limit, end } } {
762762 var amount: usize = 0;
763763 var remaining = limit;
764764 while (remaining.nonzero()) {
lib/std/io/Reader.zig+9-9
......@@ -46,7 +46,7 @@ pub const VTable = struct {
4646 /// provided which is based on calling `read`, borrowing
4747 /// `BufferedReader.buffer` to construct a temporary `BufferedWriter` and
4848 /// ignoring the written data.
49 discard: *const fn (context: ?*anyopaque, limit: Limit) DiscardError!usize = null,
49 discard: *const fn (context: ?*anyopaque, limit: Limit) Error!usize = null,
5050};
5151
5252pub const StreamError = error{
......@@ -59,13 +59,13 @@ pub const StreamError = error{
5959 EndOfStream,
6060};
6161
62pub const DiscardError = error{
62pub const Error = error{
6363 /// See the `Reader` implementation for detailed diagnostics.
6464 ReadFailed,
6565 EndOfStream,
6666};
6767
68pub const RwRemainingError = error{
68pub const StreamRemainingError = error{
6969 /// See the `Reader` implementation for detailed diagnostics.
7070 ReadFailed,
7171 /// See the `Writer` implementation for detailed diagnostics.
......@@ -85,14 +85,14 @@ pub fn read(r: Reader, bw: *BufferedWriter, limit: Limit) StreamError!usize {
8585 return n;
8686}
8787
88pub fn discard(r: Reader, limit: Limit) DiscardError!usize {
88pub fn discard(r: Reader, limit: Limit) Error!usize {
8989 const n = try r.vtable.discard(r.context, limit);
9090 assert(n <= @intFromEnum(limit));
9191 return n;
9292}
9393
9494/// Returns total number of bytes written to `bw`.
95pub fn readRemaining(r: Reader, bw: *BufferedWriter) RwRemainingError!usize {
95pub fn readRemaining(r: Reader, bw: *BufferedWriter) StreamRemainingError!usize {
9696 const readFn = r.vtable.read;
9797 var offset: usize = 0;
9898 while (true) {
......@@ -212,7 +212,7 @@ fn endingRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) StreamErr
212212 return error.EndOfStream;
213213}
214214
215fn endingDiscard(context: ?*anyopaque, limit: Limit) DiscardError!usize {
215fn endingDiscard(context: ?*anyopaque, limit: Limit) Error!usize {
216216 _ = context;
217217 _ = limit;
218218 return error.EndOfStream;
......@@ -225,7 +225,7 @@ fn failingRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) StreamEr
225225 return error.ReadFailed;
226226}
227227
228fn failingDiscard(context: ?*anyopaque, limit: Limit) DiscardError!usize {
228fn failingDiscard(context: ?*anyopaque, limit: Limit) Error!usize {
229229 _ = context;
230230 _ = limit;
231231 return error.ReadFailed;
......@@ -297,7 +297,7 @@ pub fn Hashed(comptime Hasher: type) type {
297297 return n;
298298 }
299299
300 fn discard(context: ?*anyopaque, limit: Limit) DiscardError!usize {
300 fn discard(context: ?*anyopaque, limit: Limit) Error!usize {
301301 const this: *@This() = @alignCast(@ptrCast(context));
302302 var bw = this.hasher.writable(&.{});
303303 const n = this.in.read(&bw, limit) catch |err| switch (err) {
......@@ -307,7 +307,7 @@ pub fn Hashed(comptime Hasher: type) type {
307307 return n;
308308 }
309309
310 fn readVec(context: ?*anyopaque, data: []const []u8) DiscardError!usize {
310 fn readVec(context: ?*anyopaque, data: []const []u8) Error!usize {
311311 const this: *@This() = @alignCast(@ptrCast(context));
312312 const n = try this.in.readVec(data);
313313 var remaining: usize = n;
lib/std/io/Reader/Limited.zig+1-1
......@@ -19,7 +19,7 @@ pub fn reader(l: *Limited) Reader {
1919 };
2020}
2121
22fn passthruRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.RwError!usize {
22fn passthruRead(context: ?*anyopaque, bw: *BufferedWriter, limit: Limit) Reader.StreamError!usize {
2323 const l: *Limited = @alignCast(@ptrCast(context));
2424 const combined_limit = limit.min(l.remaining);
2525 const n = try l.unlimited_reader.read(bw, combined_limit);
lib/std/tar.zig+2-2
......@@ -358,7 +358,7 @@ pub const Iterator = struct {
358358 };
359359 }
360360
361 fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) std.io.Reader.RwError!usize {
361 fn read(context: ?*anyopaque, bw: *std.io.BufferedWriter, limit: std.io.Limit) std.io.Reader.StreamError!usize {
362362 const file: *File = @ptrCast(@alignCast(context));
363363 if (file.unread_bytes.* == 0) return error.EndOfStream;
364364 const n = try file.parent_reader.read(bw, limit.min(.limited(file.unread_bytes.*)));
......@@ -381,7 +381,7 @@ pub const Iterator = struct {
381381 return n;
382382 }
383383
384 pub fn readRemaining(file: *File, out: *std.io.BufferedWriter) std.io.Reader.RwRemainingError!void {
384 pub fn readRemaining(file: *File, out: *std.io.BufferedWriter) std.io.Reader.StreamRemainingError!void {
385385 return file.reader().readRemaining(out);
386386 }
387387 };
lib/std/tar/Writer.zig+1-1
......@@ -69,7 +69,7 @@ pub fn writeFileStream(
6969 size: usize,
7070 reader: *std.io.BufferedReader,
7171 options: Options,
72) std.io.Reader.RwError!void {
72) std.io.Reader.StreamError!void {
7373 try w.writeHeader(.regular, sub_path, "", @intCast(size), options);
7474 try reader.readAll(w.underlying_writer, .limited(size));
7575 try w.writePadding(size);
lib/std/zip.zig+2-2
......@@ -202,7 +202,7 @@ pub const Decompress = union {
202202 context: ?*anyopaque,
203203 writer: *std.io.BufferedWriter,
204204 limit: std.io.Limit,
205 ) std.io.Reader.RwError!usize {
205 ) std.io.Reader.StreamError!usize {
206206 const d: *Decompress = @ptrCast(@alignCast(context));
207207 return d.store.read(writer, limit);
208208 }
......@@ -211,7 +211,7 @@ pub const Decompress = union {
211211 context: ?*anyopaque,
212212 writer: *std.io.BufferedWriter,
213213 limit: std.io.Limit,
214 ) std.io.Reader.RwError!usize {
214 ) std.io.Reader.StreamError!usize {
215215 const d: *Decompress = @ptrCast(@alignCast(context));
216216 return std.compress.flate.Decompress.read(&d.inflate, writer, limit);
217217 }
src/deprecated.zig-34
......@@ -165,40 +165,6 @@ pub fn LinearFifo(comptime T: type) type {
165165 return self.read(dest);
166166 }
167167
168 pub fn reader(self: *Self) std.io.Reader {
169 return .{
170 .context = self,
171 .vtable = &.{
172 .read = &readerRead,
173 .readVec = &readerReadVec,
174 .discard = &readerDiscard,
175 },
176 };
177 }
178 fn readerRead(
179 ctx: ?*anyopaque,
180 bw: *std.io.BufferedWriter,
181 limit: std.io.Limit,
182 ) std.io.Reader.RwError!usize {
183 const fifo: *Self = @alignCast(@ptrCast(ctx));
184 _ = fifo;
185 _ = bw;
186 _ = limit;
187 @panic("TODO");
188 }
189 fn readerReadVec(ctx: ?*anyopaque, data: []const []u8) std.io.Reader.Error!usize {
190 const fifo: *Self = @alignCast(@ptrCast(ctx));
191 _ = fifo;
192 _ = data;
193 @panic("TODO");
194 }
195 fn readerDiscard(ctx: ?*anyopaque, limit: std.io.Limit) std.io.Reader.Error!usize {
196 const fifo: *Self = @alignCast(@ptrCast(ctx));
197 _ = fifo;
198 _ = limit;
199 @panic("TODO");
200 }
201
202168 /// Returns number of items available in fifo
203169 pub fn writableLength(self: Self) usize {
204170 return self.buf.len - self.count;