From 4d4251c9f95254fe94858a4c2319cbb59d2261d0 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 1 Aug 2025 00:24:35 -0700 Subject: [PATCH] std.Io: delete LimitedReader --- lib/std/Io.zig | 4 ---- lib/std/Io/limited_reader.zig | 45 ----------------------------------- 2 files changed, 49 deletions(-) delete mode 100644 lib/std/Io/limited_reader.zig diff --git a/lib/std/Io.zig b/lib/std/Io.zig index 9018f4b714..bd1a724e4b 100644 --- a/lib/std/Io.zig +++ b/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 diff --git a/lib/std/Io/limited_reader.zig b/lib/std/Io/limited_reader.zig deleted file mode 100644 index b6b555f76d..0000000000 --- a/lib/std/Io/limited_reader.zig +++ /dev/null @@ -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, .{})); -}