std: merge io.PeekStream and io.BufferedInStreamCustom

Author: daurnimator

lib/std/io.zig

@@ -98,9 +98,6 @@ pub const bufferedOutStream = @import("io/buffered_out_stream.zig").bufferedOutS
 pub const BufferedInStream = @import("io/buffered_in_stream.zig").BufferedInStream;
 pub const bufferedInStream = @import("io/buffered_in_stream.zig").bufferedInStream;
 
-pub const PeekStream = @import("io/peek_stream.zig").PeekStream;
-pub const peekStream = @import("io/peek_stream.zig").peekStream;
-
 pub const FixedBufferStream = @import("io/fixed_buffer_stream.zig").FixedBufferStream;
 pub const fixedBufferStream = @import("io/fixed_buffer_stream.zig").fixedBufferStream;
 
@@ -151,7 +148,6 @@ test "" {
     _ = @import("io/fixed_buffer_stream.zig");
     _ = @import("io/in_stream.zig");
     _ = @import("io/out_stream.zig");
-    _ = @import("io/peek_stream.zig");
     _ = @import("io/seekable_stream.zig");
     _ = @import("io/serialization.zig");
     _ = @import("io/stream_source.zig");

lib/std/io/buffered_in_stream.zig

@@ -3,6 +3,9 @@ const io = std.io;
 const assert = std.debug.assert;
 const testing = std.testing;
 
+/// Creates a readable stream which buffers data
+/// It also supports 'un-reading' data, so that it can be read again.
+/// This makes look-ahead style parsing much easier.
 pub fn BufferedInStream(comptime buffer_type: std.fifo.LinearFifoBufferType, comptime InStreamType: type) type {
     return struct {
         unbuffered_in_stream: InStreamType,
@@ -66,6 +69,14 @@ pub fn BufferedInStream(comptime buffer_type: std.fifo.LinearFifoBufferType, com
             return dest.len;
         }
 
+        pub fn putBackByte(self: *Self, byte: u8) !void {
+            try self.putBack(&[_]u8{byte});
+        }
+
+        pub fn putBack(self: *Self, bytes: []const u8) !void {
+            try self.fifo.unget(bytes);
+        }
+
         pub fn inStream(self: *Self) InStream {
             return .{ .context = self };
         }