Commit 262bfc5826
Changed files (2)
lib
std
lib/std/Io/limited_reader.zig
@@ -1,45 +0,0 @@
-const std = @import("../std.zig");
-const io = std.io;
-const assert = std.debug.assert;
-const testing = std.testing;
-
-pub fn LimitedReader(comptime ReaderType: type) type {
- return struct {
- inner_reader: ReaderType,
- bytes_left: u64,
-
- pub const Error = ReaderType.Error;
- pub const Reader = io.GenericReader(*Self, Error, read);
-
- const Self = @This();
-
- pub fn read(self: *Self, dest: []u8) Error!usize {
- const max_read = @min(self.bytes_left, dest.len);
- const n = try self.inner_reader.read(dest[0..max_read]);
- self.bytes_left -= n;
- return n;
- }
-
- pub fn reader(self: *Self) Reader {
- return .{ .context = self };
- }
- };
-}
-
-/// Returns an initialised `LimitedReader`.
-/// `bytes_left` is a `u64` to be able to take 64 bit file offsets
-pub fn limitedReader(inner_reader: anytype, bytes_left: u64) LimitedReader(@TypeOf(inner_reader)) {
- return .{ .inner_reader = inner_reader, .bytes_left = bytes_left };
-}
-
-test "basic usage" {
- const data = "hello world";
- var fbs = std.io.fixedBufferStream(data);
- var early_stream = limitedReader(fbs.reader(), 3);
-
- var buf: [5]u8 = undefined;
- try testing.expectEqual(@as(usize, 3), try early_stream.reader().read(&buf));
- try testing.expectEqualSlices(u8, data[0..3], buf[0..3]);
- try testing.expectEqual(@as(usize, 0), try early_stream.reader().read(&buf));
- try testing.expectError(error.EndOfStream, early_stream.reader().skipBytes(10, .{}));
-}
lib/std/Io.zig
@@ -431,10 +431,6 @@ pub const bufferedWriter = @import("Io/buffered_writer.zig").bufferedWriter;
pub const FixedBufferStream = @import("Io/fixed_buffer_stream.zig").FixedBufferStream;
/// Deprecated in favor of `Reader`.
pub const fixedBufferStream = @import("Io/fixed_buffer_stream.zig").fixedBufferStream;
-/// Deprecated in favor of `Reader.Limited`.
-pub const LimitedReader = @import("Io/limited_reader.zig").LimitedReader;
-/// Deprecated in favor of `Reader.Limited`.
-pub const limitedReader = @import("Io/limited_reader.zig").limitedReader;
/// Deprecated with no replacement; inefficient pattern
pub const CountingWriter = @import("Io/counting_writer.zig").CountingWriter;
/// Deprecated with no replacement; inefficient pattern