Skip to content

Commit 5a2a2df

Browse files
committed
std.Io: delete BufferedReader
1 parent c91d1e3 commit 5a2a2df

File tree

6 files changed

+13
-232
lines changed

6 files changed

+13
-232
lines changed

lib/compiler/resinator/errors.zig

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,11 +1078,9 @@ const CorrespondingLines = struct {
10781078
at_eof: bool = false,
10791079
span: SourceMappings.CorrespondingSpan,
10801080
file: std.fs.File,
1081-
buffered_reader: BufferedReaderType,
1081+
buffered_reader: *std.Io.Reader,
10821082
code_page: SupportedCodePage,
10831083

1084-
const BufferedReaderType = std.io.BufferedReader(512, std.fs.File.DeprecatedReader);
1085-
10861084
pub fn init(cwd: std.fs.Dir, err_details: ErrorDetails, line_for_comparison: []const u8, corresponding_span: SourceMappings.CorrespondingSpan, corresponding_file: []const u8) !CorrespondingLines {
10871085
// We don't do line comparison for this error, so don't print the note if the line
10881086
// number is different
@@ -1101,9 +1099,7 @@ const CorrespondingLines = struct {
11011099
.buffered_reader = undefined,
11021100
.code_page = err_details.code_page,
11031101
};
1104-
corresponding_lines.buffered_reader = BufferedReaderType{
1105-
.unbuffered_reader = corresponding_lines.file.deprecatedReader(),
1106-
};
1102+
corresponding_lines.buffered_reader = corresponding_lines.file.reader();
11071103
errdefer corresponding_lines.deinit();
11081104

11091105
var fbs = std.io.fixedBufferStream(&corresponding_lines.line_buf);

lib/docs/wasm/markdown.zig

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,12 @@ fn mainImpl() !void {
145145
var parser = try Parser.init(gpa);
146146
defer parser.deinit();
147147

148-
var stdin_buf = std.io.bufferedReader(std.fs.File.stdin().deprecatedReader());
149-
var line_buf = std.ArrayList(u8).init(gpa);
150-
defer line_buf.deinit();
151-
while (stdin_buf.reader().streamUntilDelimiter(line_buf.writer(), '\n', null)) {
152-
if (line_buf.getLastOrNull() == '\r') _ = line_buf.pop();
153-
try parser.feedLine(line_buf.items);
154-
line_buf.clearRetainingCapacity();
148+
var stdin_buffer: [1024]u8 = undefined;
149+
var stdin_reader = std.fs.File.stdin().reader(&stdin_buffer);
150+
151+
while (stdin_reader.takeDelimiterExclusive('\n')) |line| {
152+
const trimmed = std.mem.trimRight(u8, line, '\r');
153+
try parser.feedLine(trimmed);
155154
} else |err| switch (err) {
156155
error.EndOfStream => {},
157156
else => |e| return e,

lib/std/Io.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -443,12 +443,6 @@ pub const BufferedWriter = @import("Io/buffered_writer.zig").BufferedWriter;
443443
/// Deprecated in favor of `Writer`.
444444
pub const bufferedWriter = @import("Io/buffered_writer.zig").bufferedWriter;
445445
/// Deprecated in favor of `Reader`.
446-
pub const BufferedReader = @import("Io/buffered_reader.zig").BufferedReader;
447-
/// Deprecated in favor of `Reader`.
448-
pub const bufferedReader = @import("Io/buffered_reader.zig").bufferedReader;
449-
/// Deprecated in favor of `Reader`.
450-
pub const bufferedReaderSize = @import("Io/buffered_reader.zig").bufferedReaderSize;
451-
/// Deprecated in favor of `Reader`.
452446
pub const FixedBufferStream = @import("Io/fixed_buffer_stream.zig").FixedBufferStream;
453447
/// Deprecated in favor of `Reader`.
454448
pub const fixedBufferStream = @import("Io/fixed_buffer_stream.zig").fixedBufferStream;
@@ -941,7 +935,6 @@ pub fn PollFiles(comptime StreamEnum: type) type {
941935
test {
942936
_ = Reader;
943937
_ = Writer;
944-
_ = BufferedReader;
945938
_ = BufferedWriter;
946939
_ = CountingWriter;
947940
_ = CountingReader;

lib/std/Io/buffered_reader.zig

Lines changed: 0 additions & 201 deletions
This file was deleted.

lib/std/Io/test.zig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ test "write a file, read it, then delete it" {
4545
const expected_file_size: u64 = "begin".len + data.len + "end".len;
4646
try expectEqual(expected_file_size, file_size);
4747

48-
var buf_stream = io.bufferedReader(file.deprecatedReader());
49-
const st = buf_stream.reader();
50-
const contents = try st.readAllAlloc(std.testing.allocator, 2 * 1024);
48+
var file_buffer: [1024]u8 = undefined;
49+
var file_reader = file.reader(&file_buffer);
50+
const contents = try file_reader.interface.allocRemaining(std.testing.allocator, .limited(2 * 1024));
5151
defer std.testing.allocator.free(contents);
5252

5353
try expect(mem.eql(u8, contents[0.."begin".len], "begin"));

src/Package/Fetch.zig

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,14 +1194,8 @@ fn unpackResource(
11941194
},
11951195
.@"tar.xz" => {
11961196
const gpa = f.arena.child_allocator;
1197-
const reader = resource.reader();
1198-
var br = std.io.bufferedReaderSize(std.crypto.tls.max_ciphertext_record_len, reader);
1199-
var dcp = std.compress.xz.decompress(gpa, br.reader()) catch |err| {
1200-
return f.fail(f.location_tok, try eb.printString(
1201-
"unable to decompress tarball: {s}",
1202-
.{@errorName(err)},
1203-
));
1204-
};
1197+
var dcp = std.compress.xz.decompress(gpa, resource.reader().adaptToOldInterface()) catch |err|
1198+
return f.fail(f.location_tok, try eb.printString("unable to decompress tarball: {t}", .{err}));
12051199
defer dcp.deinit();
12061200
var adapter_buffer: [1024]u8 = undefined;
12071201
var adapter = dcp.reader().adaptToNewApi(&adapter_buffer);

0 commit comments

Comments
 (0)