authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-06-24 10:37:59-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:30-07:00
log743326f8e929238a843697397d21361c4081fead
treec0b19b45d0978f327b6d0473bbd50dbc2ed03821
parent9d18e31feef1eeefa766d4a629a527ec3936ace3

std.io.Reader.bufferContents -> buffered

10 files changed, 30 insertions(+), 30 deletions(-)

lib/compiler/std-docs.zig+1-1
...@@ -342,7 +342,7 @@ fn buildWasmBinary(...@@ -342,7 +342,7 @@ fn buildWasmBinary(
342 }342 }
343343
344 if (poller.reader(.stderr).buffer.len > 0) {344 if (poller.reader(.stderr).buffer.len > 0) {
345 std.debug.print("{s}", .{poller.reader(.stderr).bufferContents()});345 std.debug.print("{s}", .{poller.reader(.stderr).buffered()});
346 }346 }
347347
348 // Send EOF to stdin.348 // Send EOF to stdin.
lib/std/Build/Fuzz/WebServer.zig+3-3
...@@ -285,9 +285,9 @@ fn buildWasmBinary(...@@ -285,9 +285,9 @@ fn buildWasmBinary(
285 const stdout_br = poller.reader(.stdout);285 const stdout_br = poller.reader(.stdout);
286 poll: while (true) {286 poll: while (true) {
287 const Header = std.zig.Server.Message.Header;287 const Header = std.zig.Server.Message.Header;
288 while (stdout_br.bufferContents().len < @sizeOf(Header)) if (!try poller.poll()) break :poll;288 while (stdout_br.buffered().len < @sizeOf(Header)) if (!try poller.poll()) break :poll;
289 const header = (stdout_br.takeStruct(Header) catch unreachable).*;289 const header = (stdout_br.takeStruct(Header) catch unreachable).*;
290 while (stdout_br.bufferContents().len < header.bytes_len) if (!try poller.poll()) break :poll;290 while (stdout_br.buffered().len < header.bytes_len) if (!try poller.poll()) break :poll;
291 const body = stdout_br.take(header.bytes_len) catch unreachable;291 const body = stdout_br.take(header.bytes_len) catch unreachable;
292 switch (header.tag) {292 switch (header.tag) {
293 .zig_version => {293 .zig_version => {
...@@ -328,7 +328,7 @@ fn buildWasmBinary(...@@ -328,7 +328,7 @@ fn buildWasmBinary(
328 }328 }
329329
330 const stderr_br = poller.reader(.stderr);330 const stderr_br = poller.reader(.stderr);
331 const stderr_contents = stderr_br.bufferContents();331 const stderr_contents = stderr_br.buffered();
332 if (stderr_contents.len > 0) {332 if (stderr_contents.len > 0) {
333 std.debug.print("{s}", .{stderr_contents});333 std.debug.print("{s}", .{stderr_contents});
334 }334 }
lib/std/Build/Step.zig+3-3
...@@ -516,9 +516,9 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?Path {...@@ -516,9 +516,9 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?Path {
516 const stdout_br = zp.poller.reader(.stdout);516 const stdout_br = zp.poller.reader(.stdout);
517 poll: while (true) {517 poll: while (true) {
518 const Header = std.zig.Server.Message.Header;518 const Header = std.zig.Server.Message.Header;
519 while (stdout_br.bufferContents().len < @sizeOf(Header)) if (!try zp.poller.poll()) break :poll;519 while (stdout_br.buffered().len < @sizeOf(Header)) if (!try zp.poller.poll()) break :poll;
520 const header = (stdout_br.takeStruct(Header) catch unreachable).*;520 const header = (stdout_br.takeStruct(Header) catch unreachable).*;
521 while (stdout_br.bufferContents().len < header.bytes_len) if (!try zp.poller.poll()) break :poll;521 while (stdout_br.buffered().len < header.bytes_len) if (!try zp.poller.poll()) break :poll;
522 const body = stdout_br.take(header.bytes_len) catch unreachable;522 const body = stdout_br.take(header.bytes_len) catch unreachable;
523 switch (header.tag) {523 switch (header.tag) {
524 .zig_version => {524 .zig_version => {
...@@ -610,7 +610,7 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?Path {...@@ -610,7 +610,7 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?Path {
610 s.result_duration_ns = timer.read();610 s.result_duration_ns = timer.read();
611611
612 const stderr_br = zp.poller.reader(.stderr);612 const stderr_br = zp.poller.reader(.stderr);
613 const stderr_contents = stderr_br.bufferContents();613 const stderr_contents = stderr_br.buffered();
614 if (stderr_contents.len > 0) {614 if (stderr_contents.len > 0) {
615 try s.result_error_msgs.append(arena, try arena.dupe(u8, stderr_contents));615 try s.result_error_msgs.append(arena, try arena.dupe(u8, stderr_contents));
616 }616 }
lib/std/Build/Step/CheckObject.zig+1-1
...@@ -1785,7 +1785,7 @@ const ElfDumper = struct {...@@ -1785,7 +1785,7 @@ const ElfDumper = struct {
1785 .p64 => @sizeOf(u64),1785 .p64 => @sizeOf(u64),
1786 };1786 };
1787 _ = try br.discard(.limited(num * ptr_size));1787 _ = try br.discard(.limited(num * ptr_size));
1788 const strtab = br.bufferContents();1788 const strtab = br.buffered();
17891789
1790 assert(ctx.symtab.len == 0);1790 assert(ctx.symtab.len == 0);
1791 ctx.symtab = try ctx.gpa.alloc(ArSymtabEntry, num);1791 ctx.symtab = try ctx.gpa.alloc(ArSymtabEntry, num);
lib/std/Build/Step/Run.zig+8-8
...@@ -1529,9 +1529,9 @@ fn evalZigTest(...@@ -1529,9 +1529,9 @@ fn evalZigTest(
1529 const stderr_br = poller.reader(.stderr);1529 const stderr_br = poller.reader(.stderr);
1530 const any_write_failed = first_write_failed or poll: while (true) {1530 const any_write_failed = first_write_failed or poll: while (true) {
1531 const Header = std.zig.Server.Message.Header;1531 const Header = std.zig.Server.Message.Header;
1532 while (stdout_br.bufferContents().len < @sizeOf(Header)) if (!try poller.poll()) break :poll false;1532 while (stdout_br.buffered().len < @sizeOf(Header)) if (!try poller.poll()) break :poll false;
1533 const header = (stdout_br.takeStruct(Header) catch unreachable).*;1533 const header = (stdout_br.takeStruct(Header) catch unreachable).*;
1534 while (stdout_br.bufferContents().len < header.bytes_len) if (!try poller.poll()) break :poll false;1534 while (stdout_br.buffered().len < header.bytes_len) if (!try poller.poll()) break :poll false;
1535 const body = stdout_br.take(header.bytes_len) catch unreachable;1535 const body = stdout_br.take(header.bytes_len) catch unreachable;
1536 switch (header.tag) {1536 switch (header.tag) {
1537 .zig_version => {1537 .zig_version => {
...@@ -1589,7 +1589,7 @@ fn evalZigTest(...@@ -1589,7 +1589,7 @@ fn evalZigTest(
15891589
1590 if (tr_hdr.flags.fail or tr_hdr.flags.leak or tr_hdr.flags.log_err_count > 0) {1590 if (tr_hdr.flags.fail or tr_hdr.flags.leak or tr_hdr.flags.log_err_count > 0) {
1591 const name = std.mem.sliceTo(md.string_bytes[md.names[tr_hdr.index]..], 0);1591 const name = std.mem.sliceTo(md.string_bytes[md.names[tr_hdr.index]..], 0);
1592 const stderr_contents = stderr_br.bufferContents();1592 const stderr_contents = stderr_br.buffered();
1593 stderr_br.toss(stderr_contents.len);1593 stderr_br.toss(stderr_contents.len);
1594 const msg = std.mem.trim(u8, stderr_contents, "\n");1594 const msg = std.mem.trim(u8, stderr_contents, "\n");
1595 const label = if (tr_hdr.flags.fail)1595 const label = if (tr_hdr.flags.fail)
...@@ -1650,7 +1650,7 @@ fn evalZigTest(...@@ -1650,7 +1650,7 @@ fn evalZigTest(
1650 while (try poller.poll()) {}1650 while (try poller.poll()) {}
1651 }1651 }
16521652
1653 const stderr_contents = std.mem.trim(u8, stderr_br.bufferContents(), "\n");1653 const stderr_contents = std.mem.trim(u8, stderr_br.buffered(), "\n");
1654 if (stderr_contents.len > 0) {1654 if (stderr_contents.len > 0) {
1655 run.step.result_stderr = try arena.dupe(u8, stderr_contents);1655 run.step.result_stderr = try arena.dupe(u8, stderr_contents);
1656 }1656 }
...@@ -1777,15 +1777,15 @@ fn evalGeneric(run: *Run, child: *std.process.Child) !StdIoResult {...@@ -1777,15 +1777,15 @@ fn evalGeneric(run: *Run, child: *std.process.Child) !StdIoResult {
17771777
1778 while (try poller.poll()) {1778 while (try poller.poll()) {
1779 if (run.stdio_limit.toInt()) |limit| {1779 if (run.stdio_limit.toInt()) |limit| {
1780 if (poller.reader(.stderr).bufferContents().len > limit)1780 if (poller.reader(.stderr).buffered().len > limit)
1781 return error.StdoutStreamTooLong;1781 return error.StdoutStreamTooLong;
1782 if (poller.reader(.stderr).bufferContents().len > limit)1782 if (poller.reader(.stderr).buffered().len > limit)
1783 return error.StderrStreamTooLong;1783 return error.StderrStreamTooLong;
1784 }1784 }
1785 }1785 }
17861786
1787 stdout_bytes = poller.reader(.stdout).bufferContents();1787 stdout_bytes = poller.reader(.stdout).buffered();
1788 stderr_bytes = poller.reader(.stderr).bufferContents();1788 stderr_bytes = poller.reader(.stderr).buffered();
1789 } else {1789 } else {
1790 var fr = stdout.readerStreaming();1790 var fr = stdout.readerStreaming();
1791 stdout_bytes = fr.interface().readRemainingAlloc(arena, run.stdio_limit) catch |err| switch (err) {1791 stdout_bytes = fr.interface().readRemainingAlloc(arena, run.stdio_limit) catch |err| switch (err) {
lib/std/compress/flate/Compress.zig+2-2
...@@ -783,7 +783,7 @@ fn read(...@@ -783,7 +783,7 @@ fn read(
783 },783 },
784 else => |e| return e,784 else => |e| return e,
785 };785 };
786 const buffer_contents = c.input.bufferContents();786 const buffer_contents = c.input.buffered();
787 const min_lookahead = flate.match.min_length + flate.match.max_length;787 const min_lookahead = flate.match.min_length + flate.match.max_length;
788 const history_plus_lookahead_len = flate.history_len + min_lookahead;788 const history_plus_lookahead_len = flate.history_len + min_lookahead;
789 if (buffer_contents.len < history_plus_lookahead_len) return 0;789 if (buffer_contents.len < history_plus_lookahead_len) return 0;
...@@ -797,7 +797,7 @@ fn read(...@@ -797,7 +797,7 @@ fn read(
797 return bw.count - start;797 return bw.count - start;
798 },798 },
799 .final => {799 .final => {
800 const buffer_contents = c.input.bufferContents();800 const buffer_contents = c.input.buffered();
801 const start = bw.count;801 const start = bw.count;
802 const n = c.tokenizeSlice(bw, limit, buffer_contents) catch |err| switch (err) {802 const n = c.tokenizeSlice(bw, limit, buffer_contents) catch |err| switch (err) {
803 error.WriteFailed => return error.WriteFailed,803 error.WriteFailed => return error.WriteFailed,
lib/std/crypto/tls/Client.zig+2-2
...@@ -1068,12 +1068,12 @@ fn read(context: ?*anyopaque, bw: *Writer, limit: std.io.Limit) Reader.StreamErr...@@ -1068,12 +1068,12 @@ fn read(context: ?*anyopaque, bw: *Writer, limit: std.io.Limit) Reader.StreamErr
1068 const record_len = mem.readInt(u16, record_header[3..][0..2], .big);1068 const record_len = mem.readInt(u16, record_header[3..][0..2], .big);
1069 if (record_len > max_ciphertext_len) return failRead(c, error.TlsRecordOverflow);1069 if (record_len > max_ciphertext_len) return failRead(c, error.TlsRecordOverflow);
1070 const record_end = 5 + record_len;1070 const record_end = 5 + record_len;
1071 if (record_end > input.bufferContents().len) {1071 if (record_end > input.buffered().len) {
1072 input.fillMore() catch |err| switch (err) {1072 input.fillMore() catch |err| switch (err) {
1073 error.EndOfStream => return failRead(c, error.TlsConnectionTruncated),1073 error.EndOfStream => return failRead(c, error.TlsConnectionTruncated),
1074 error.ReadFailed => return error.ReadFailed,1074 error.ReadFailed => return error.ReadFailed,
1075 };1075 };
1076 if (record_end > input.bufferContents().len) return 0;1076 if (record_end > input.buffered().len) return 0;
1077 }1077 }
10781078
1079 var cleartext_stack_buffer: [max_ciphertext_len]u8 = undefined;1079 var cleartext_stack_buffer: [max_ciphertext_len]u8 = undefined;
lib/std/http.zig+5-5
...@@ -418,7 +418,7 @@ pub const Reader = struct {...@@ -418,7 +418,7 @@ pub const Reader = struct {
418 },418 },
419 error.ReadFailed => return error.ReadFailed,419 error.ReadFailed => return error.ReadFailed,
420 };420 };
421 head_end += hp.feed(in.bufferContents()[head_end..]);421 head_end += hp.feed(in.buffered()[head_end..]);
422 if (hp.state == .finished) {422 if (hp.state == .finished) {
423 reader.head_buffer = in.steal(head_end);423 reader.head_buffer = in.steal(head_end);
424 reader.state = .received_head;424 reader.state = .received_head;
...@@ -577,7 +577,7 @@ pub const Reader = struct {...@@ -577,7 +577,7 @@ pub const Reader = struct {
577 .head => {577 .head => {
578 var cp: ChunkParser = .init;578 var cp: ChunkParser = .init;
579 while (true) {579 while (true) {
580 const i = cp.feed(in.bufferContents());580 const i = cp.feed(in.buffered());
581 switch (cp.state) {581 switch (cp.state) {
582 .invalid => return error.HttpChunkInvalid,582 .invalid => return error.HttpChunkInvalid,
583 .data => {583 .data => {
...@@ -645,7 +645,7 @@ pub const Reader = struct {...@@ -645,7 +645,7 @@ pub const Reader = struct {
645 .head => {645 .head => {
646 var cp: ChunkParser = .init;646 var cp: ChunkParser = .init;
647 while (true) {647 while (true) {
648 const i = cp.feed(in.bufferContents());648 const i = cp.feed(in.buffered());
649 switch (cp.state) {649 switch (cp.state) {
650 .invalid => return error.HttpChunkInvalid,650 .invalid => return error.HttpChunkInvalid,
651 .data => {651 .data => {
...@@ -699,10 +699,10 @@ pub const Reader = struct {...@@ -699,10 +699,10 @@ pub const Reader = struct {
699 while (true) {699 while (true) {
700 if (trailers_len >= in.buffer.len) return error.HttpHeadersOversize;700 if (trailers_len >= in.buffer.len) return error.HttpHeadersOversize;
701 try in.fill(trailers_len + 1);701 try in.fill(trailers_len + 1);
702 trailers_len += hp.feed(in.bufferContents()[trailers_len..]);702 trailers_len += hp.feed(in.buffered()[trailers_len..]);
703 if (hp.state == .finished) {703 if (hp.state == .finished) {
704 reader.state = .ready;704 reader.state = .ready;
705 reader.trailers = in.bufferContents()[0..trailers_len];705 reader.trailers = in.buffered()[0..trailers_len];
706 in.toss(trailers_len);706 in.toss(trailers_len);
707 return amt_read;707 return amt_read;
708 }708 }
lib/std/process/Child.zig+4-4
...@@ -352,11 +352,11 @@ fn writeBufferedReaderToArrayList(allocator: Allocator, list: *std.ArrayListUnma...@@ -352,11 +352,11 @@ fn writeBufferedReaderToArrayList(allocator: Allocator, list: *std.ArrayListUnma
352 assert(r.seek == 0);352 assert(r.seek == 0);
353 if (list.capacity == 0) {353 if (list.capacity == 0) {
354 list.* = .{354 list.* = .{
355 .items = r.bufferContents(),355 .items = r.buffered(),
356 .capacity = r.buffer.len,356 .capacity = r.buffer.len,
357 };357 };
358 } else {358 } else {
359 try list.appendSlice(allocator, r.bufferContents());359 try list.appendSlice(allocator, r.buffered());
360 }360 }
361}361}
362362
...@@ -383,9 +383,9 @@ pub fn collectOutput(...@@ -383,9 +383,9 @@ pub fn collectOutput(
383 defer poller.deinit();383 defer poller.deinit();
384384
385 while (try poller.poll()) {385 while (try poller.poll()) {
386 if (poller.reader(.stdout).bufferContents().len > max_output_bytes)386 if (poller.reader(.stdout).buffered().len > max_output_bytes)
387 return error.StdoutStreamTooLong;387 return error.StdoutStreamTooLong;
388 if (poller.reader(.stderr).bufferContents().len > max_output_bytes)388 if (poller.reader(.stderr).buffered().len > max_output_bytes)
389 return error.StderrStreamTooLong;389 return error.StderrStreamTooLong;
390 }390 }
391391
src/Package/Fetch/git.zig+1-1
...@@ -1347,7 +1347,7 @@ fn indexPackFirstPass(...@@ -1347,7 +1347,7 @@ fn indexPackFirstPass(
1347 const pack_header = try PackHeader.read(&pack_hashed.interface);1347 const pack_header = try PackHeader.read(&pack_hashed.interface);
13481348
1349 for (0..pack_header.total_objects) |_| {1349 for (0..pack_header.total_objects) |_| {
1350 const entry_offset = pack.pos - pack_hashed.interface.bufferContents().len;1350 const entry_offset = pack.pos - pack_hashed.interface.buffered().len;
1351 var entry_buffer: [64]u8 = undefined; // Buffer only needed for loading EntryHeader.1351 var entry_buffer: [64]u8 = undefined; // Buffer only needed for loading EntryHeader.
1352 var entry_crc32_reader = pack_hashed.interface.hashed(std.hash.Crc32.init(), &entry_buffer);1352 var entry_crc32_reader = pack_hashed.interface.hashed(std.hash.Crc32.init(), &entry_buffer);
1353 const entry_crc32_br = &entry_crc32_reader.interface;1353 const entry_crc32_br = &entry_crc32_reader.interface;