From cfe71cb67a3cf3814ce12d2a2d87192ef905b9fd Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Thu, 16 Sep 2021 17:19:41 -0700 Subject: [PATCH] std.fifo.LinearFifo: ensureUnusedCapacity and ensureTotalCapacity Same as c8ae581fef6506a8234cdba1355ba7f0f449031a, but for LinearFifo. --- lib/std/fifo.zig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/std/fifo.zig b/lib/std/fifo.zig index 93ef50b861..e4b2cd8be9 100644 --- a/lib/std/fifo.zig +++ b/lib/std/fifo.zig @@ -119,8 +119,11 @@ pub fn LinearFifo( } } + /// Deprecated: call `ensureUnusedCapacity` or `ensureTotalCapacity`. + pub const ensureCapacity = ensureTotalCapacity; + /// Ensure that the buffer can fit at least `size` items - pub fn ensureCapacity(self: *Self, size: usize) !void { + pub fn ensureTotalCapacity(self: *Self, size: usize) !void { if (self.buf.len >= size) return; if (buffer_type == .Dynamic) { self.realign(); @@ -135,7 +138,7 @@ pub fn LinearFifo( pub fn ensureUnusedCapacity(self: *Self, size: usize) error{OutOfMemory}!void { if (self.writableLength() >= size) return; - return try self.ensureCapacity(math.add(usize, self.count, size) catch return error.OutOfMemory); + return try self.ensureTotalCapacity(math.add(usize, self.count, size) catch return error.OutOfMemory); } /// Returns number of items currently in fifo @@ -471,7 +474,7 @@ test "LinearFifo(u8, .Dynamic)" { } { - try fifo.ensureCapacity(1); + try fifo.ensureTotalCapacity(1); var in_fbs = std.io.fixedBufferStream("pump test"); var out_buf: [50]u8 = undefined; var out_fbs = std.io.fixedBufferStream(&out_buf);