diff --git a/lib/compiler/std-docs.zig b/lib/compiler/std-docs.zig index a094771a18..62d75924d3 100644 --- a/lib/compiler/std-docs.zig +++ b/lib/compiler/std-docs.zig @@ -342,7 +342,7 @@ fn buildWasmBinary( } if (poller.reader(.stderr).buffer.len > 0) { - std.debug.print("{s}", .{poller.reader(.stderr).bufferContents()}); + std.debug.print("{s}", .{poller.reader(.stderr).buffered()}); } // Send EOF to stdin. diff --git a/lib/std/Build/Fuzz/WebServer.zig b/lib/std/Build/Fuzz/WebServer.zig index 1d640c9c30..9c9ba00f4e 100644 --- a/lib/std/Build/Fuzz/WebServer.zig +++ b/lib/std/Build/Fuzz/WebServer.zig @@ -285,9 +285,9 @@ fn buildWasmBinary( const stdout_br = poller.reader(.stdout); poll: while (true) { const Header = std.zig.Server.Message.Header; - while (stdout_br.bufferContents().len < @sizeOf(Header)) if (!try poller.poll()) break :poll; + while (stdout_br.buffered().len < @sizeOf(Header)) if (!try poller.poll()) break :poll; const header = (stdout_br.takeStruct(Header) catch unreachable).*; - while (stdout_br.bufferContents().len < header.bytes_len) if (!try poller.poll()) break :poll; + while (stdout_br.buffered().len < header.bytes_len) if (!try poller.poll()) break :poll; const body = stdout_br.take(header.bytes_len) catch unreachable; switch (header.tag) { .zig_version => { @@ -328,7 +328,7 @@ fn buildWasmBinary( } const stderr_br = poller.reader(.stderr); - const stderr_contents = stderr_br.bufferContents(); + const stderr_contents = stderr_br.buffered(); if (stderr_contents.len > 0) { std.debug.print("{s}", .{stderr_contents}); } diff --git a/lib/std/Build/Step.zig b/lib/std/Build/Step.zig index 01d01f626b..51beb03149 100644 --- a/lib/std/Build/Step.zig +++ b/lib/std/Build/Step.zig @@ -516,9 +516,9 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?Path { const stdout_br = zp.poller.reader(.stdout); poll: while (true) { const Header = std.zig.Server.Message.Header; - while (stdout_br.bufferContents().len < @sizeOf(Header)) if (!try zp.poller.poll()) break :poll; + while (stdout_br.buffered().len < @sizeOf(Header)) if (!try zp.poller.poll()) break :poll; const header = (stdout_br.takeStruct(Header) catch unreachable).*; - while (stdout_br.bufferContents().len < header.bytes_len) if (!try zp.poller.poll()) break :poll; + while (stdout_br.buffered().len < header.bytes_len) if (!try zp.poller.poll()) break :poll; const body = stdout_br.take(header.bytes_len) catch unreachable; switch (header.tag) { .zig_version => { @@ -610,7 +610,7 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?Path { s.result_duration_ns = timer.read(); const stderr_br = zp.poller.reader(.stderr); - const stderr_contents = stderr_br.bufferContents(); + const stderr_contents = stderr_br.buffered(); if (stderr_contents.len > 0) { try s.result_error_msgs.append(arena, try arena.dupe(u8, stderr_contents)); } diff --git a/lib/std/Build/Step/CheckObject.zig b/lib/std/Build/Step/CheckObject.zig index b443a1025b..914219947b 100644 --- a/lib/std/Build/Step/CheckObject.zig +++ b/lib/std/Build/Step/CheckObject.zig @@ -1785,7 +1785,7 @@ const ElfDumper = struct { .p64 => @sizeOf(u64), }; _ = try br.discard(.limited(num * ptr_size)); - const strtab = br.bufferContents(); + const strtab = br.buffered(); assert(ctx.symtab.len == 0); ctx.symtab = try ctx.gpa.alloc(ArSymtabEntry, num); diff --git a/lib/std/Build/Step/Run.zig b/lib/std/Build/Step/Run.zig index 5648e92458..b62606f29e 100644 --- a/lib/std/Build/Step/Run.zig +++ b/lib/std/Build/Step/Run.zig @@ -1529,9 +1529,9 @@ fn evalZigTest( const stderr_br = poller.reader(.stderr); const any_write_failed = first_write_failed or poll: while (true) { const Header = std.zig.Server.Message.Header; - while (stdout_br.bufferContents().len < @sizeOf(Header)) if (!try poller.poll()) break :poll false; + while (stdout_br.buffered().len < @sizeOf(Header)) if (!try poller.poll()) break :poll false; const header = (stdout_br.takeStruct(Header) catch unreachable).*; - while (stdout_br.bufferContents().len < header.bytes_len) if (!try poller.poll()) break :poll false; + while (stdout_br.buffered().len < header.bytes_len) if (!try poller.poll()) break :poll false; const body = stdout_br.take(header.bytes_len) catch unreachable; switch (header.tag) { .zig_version => { @@ -1589,7 +1589,7 @@ fn evalZigTest( if (tr_hdr.flags.fail or tr_hdr.flags.leak or tr_hdr.flags.log_err_count > 0) { const name = std.mem.sliceTo(md.string_bytes[md.names[tr_hdr.index]..], 0); - const stderr_contents = stderr_br.bufferContents(); + const stderr_contents = stderr_br.buffered(); stderr_br.toss(stderr_contents.len); const msg = std.mem.trim(u8, stderr_contents, "\n"); const label = if (tr_hdr.flags.fail) @@ -1650,7 +1650,7 @@ fn evalZigTest( while (try poller.poll()) {} } - const stderr_contents = std.mem.trim(u8, stderr_br.bufferContents(), "\n"); + const stderr_contents = std.mem.trim(u8, stderr_br.buffered(), "\n"); if (stderr_contents.len > 0) { run.step.result_stderr = try arena.dupe(u8, stderr_contents); } @@ -1777,15 +1777,15 @@ fn evalGeneric(run: *Run, child: *std.process.Child) !StdIoResult { while (try poller.poll()) { if (run.stdio_limit.toInt()) |limit| { - if (poller.reader(.stderr).bufferContents().len > limit) + if (poller.reader(.stderr).buffered().len > limit) return error.StdoutStreamTooLong; - if (poller.reader(.stderr).bufferContents().len > limit) + if (poller.reader(.stderr).buffered().len > limit) return error.StderrStreamTooLong; } } - stdout_bytes = poller.reader(.stdout).bufferContents(); - stderr_bytes = poller.reader(.stderr).bufferContents(); + stdout_bytes = poller.reader(.stdout).buffered(); + stderr_bytes = poller.reader(.stderr).buffered(); } else { var fr = stdout.readerStreaming(); stdout_bytes = fr.interface().readRemainingAlloc(arena, run.stdio_limit) catch |err| switch (err) { diff --git a/lib/std/compress/flate/Compress.zig b/lib/std/compress/flate/Compress.zig index 8a12f72346..92cb3a4c5a 100644 --- a/lib/std/compress/flate/Compress.zig +++ b/lib/std/compress/flate/Compress.zig @@ -783,7 +783,7 @@ fn read( }, else => |e| return e, }; - const buffer_contents = c.input.bufferContents(); + const buffer_contents = c.input.buffered(); const min_lookahead = flate.match.min_length + flate.match.max_length; const history_plus_lookahead_len = flate.history_len + min_lookahead; if (buffer_contents.len < history_plus_lookahead_len) return 0; @@ -797,7 +797,7 @@ fn read( return bw.count - start; }, .final => { - const buffer_contents = c.input.bufferContents(); + const buffer_contents = c.input.buffered(); const start = bw.count; const n = c.tokenizeSlice(bw, limit, buffer_contents) catch |err| switch (err) { error.WriteFailed => return error.WriteFailed, diff --git a/lib/std/crypto/tls/Client.zig b/lib/std/crypto/tls/Client.zig index 047fec8d02..29399dcd87 100644 --- a/lib/std/crypto/tls/Client.zig +++ b/lib/std/crypto/tls/Client.zig @@ -1068,12 +1068,12 @@ fn read(context: ?*anyopaque, bw: *Writer, limit: std.io.Limit) Reader.StreamErr const record_len = mem.readInt(u16, record_header[3..][0..2], .big); if (record_len > max_ciphertext_len) return failRead(c, error.TlsRecordOverflow); const record_end = 5 + record_len; - if (record_end > input.bufferContents().len) { + if (record_end > input.buffered().len) { input.fillMore() catch |err| switch (err) { error.EndOfStream => return failRead(c, error.TlsConnectionTruncated), error.ReadFailed => return error.ReadFailed, }; - if (record_end > input.bufferContents().len) return 0; + if (record_end > input.buffered().len) return 0; } var cleartext_stack_buffer: [max_ciphertext_len]u8 = undefined; diff --git a/lib/std/http.zig b/lib/std/http.zig index 1ff20dd3f6..fec584a53a 100644 --- a/lib/std/http.zig +++ b/lib/std/http.zig @@ -418,7 +418,7 @@ pub const Reader = struct { }, error.ReadFailed => return error.ReadFailed, }; - head_end += hp.feed(in.bufferContents()[head_end..]); + head_end += hp.feed(in.buffered()[head_end..]); if (hp.state == .finished) { reader.head_buffer = in.steal(head_end); reader.state = .received_head; @@ -577,7 +577,7 @@ pub const Reader = struct { .head => { var cp: ChunkParser = .init; while (true) { - const i = cp.feed(in.bufferContents()); + const i = cp.feed(in.buffered()); switch (cp.state) { .invalid => return error.HttpChunkInvalid, .data => { @@ -645,7 +645,7 @@ pub const Reader = struct { .head => { var cp: ChunkParser = .init; while (true) { - const i = cp.feed(in.bufferContents()); + const i = cp.feed(in.buffered()); switch (cp.state) { .invalid => return error.HttpChunkInvalid, .data => { @@ -699,10 +699,10 @@ pub const Reader = struct { while (true) { if (trailers_len >= in.buffer.len) return error.HttpHeadersOversize; try in.fill(trailers_len + 1); - trailers_len += hp.feed(in.bufferContents()[trailers_len..]); + trailers_len += hp.feed(in.buffered()[trailers_len..]); if (hp.state == .finished) { reader.state = .ready; - reader.trailers = in.bufferContents()[0..trailers_len]; + reader.trailers = in.buffered()[0..trailers_len]; in.toss(trailers_len); return amt_read; } diff --git a/lib/std/process/Child.zig b/lib/std/process/Child.zig index 617ea966ab..3eea69b90d 100644 --- a/lib/std/process/Child.zig +++ b/lib/std/process/Child.zig @@ -352,11 +352,11 @@ fn writeBufferedReaderToArrayList(allocator: Allocator, list: *std.ArrayListUnma assert(r.seek == 0); if (list.capacity == 0) { list.* = .{ - .items = r.bufferContents(), + .items = r.buffered(), .capacity = r.buffer.len, }; } else { - try list.appendSlice(allocator, r.bufferContents()); + try list.appendSlice(allocator, r.buffered()); } } @@ -383,9 +383,9 @@ pub fn collectOutput( defer poller.deinit(); while (try poller.poll()) { - if (poller.reader(.stdout).bufferContents().len > max_output_bytes) + if (poller.reader(.stdout).buffered().len > max_output_bytes) return error.StdoutStreamTooLong; - if (poller.reader(.stderr).bufferContents().len > max_output_bytes) + if (poller.reader(.stderr).buffered().len > max_output_bytes) return error.StderrStreamTooLong; } diff --git a/src/Package/Fetch/git.zig b/src/Package/Fetch/git.zig index 0a06329e6b..816d22f724 100644 --- a/src/Package/Fetch/git.zig +++ b/src/Package/Fetch/git.zig @@ -1347,7 +1347,7 @@ fn indexPackFirstPass( const pack_header = try PackHeader.read(&pack_hashed.interface); for (0..pack_header.total_objects) |_| { - const entry_offset = pack.pos - pack_hashed.interface.bufferContents().len; + const entry_offset = pack.pos - pack_hashed.interface.buffered().len; var entry_buffer: [64]u8 = undefined; // Buffer only needed for loading EntryHeader. var entry_crc32_reader = pack_hashed.interface.hashed(std.hash.Crc32.init(), &entry_buffer); const entry_crc32_br = &entry_crc32_reader.interface;