Skip to content

Commit a77678b

Browse files
mrjbq7Cloudef
authored andcommitted
minilib: import BoundedArray as a temporary fix for its removal in zig-0.15.0-dev
1 parent 0699dc5 commit a77678b

File tree

4 files changed

+393
-2
lines changed

4 files changed

+393
-2
lines changed

src/aio/IoUring.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const aio = @import("../aio.zig");
33
const Operation = @import("ops.zig").Operation;
44
const posix = @import("posix/posix.zig");
55
const linux = @import("posix/linux.zig");
6+
const BoundedArray = @import("minilib").BoundedArray;
67
const log = std.log.scoped(.aio_io_uring);
78

89
const Supported = struct {
@@ -159,7 +160,7 @@ pub fn queue(self: *@This(), pairs: anytype, handler: anytype) aio.Error!void {
159160
const saved_sq = self.io.sq;
160161
errdefer self.io.sq = saved_sq;
161162
if (comptime pairs.len > 1) {
162-
var ids: std.BoundedArray(aio.Id, pairs.len) = .{};
163+
var ids: BoundedArray(aio.Id, pairs.len) = .{};
163164
errdefer inline for (ids.constSlice(), pairs) |id, pair| {
164165
debug("dequeue: {f}: {any}, {s}", .{ id, pair.tag, @tagName(pair.link) });
165166
self.ops.release(id) catch unreachable;

src/aio/uringlator.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const aio = @import("../aio.zig");
55
const Operation = @import("ops.zig").Operation;
66
const DoubleBufferedFixedArrayList = @import("minilib").DoubleBufferedFixedArrayList;
77
const FixedArrayList = @import("minilib").FixedArrayList;
8+
const BoundedArray = @import("minilib").BoundedArray;
89
const posix = @import("posix/posix.zig");
910
const log = std.log.scoped(.aio_uringlator);
1011

@@ -283,7 +284,7 @@ pub fn Uringlator(BackendOperation: type) type {
283284

284285
pub fn queue(self: *@This(), pairs: anytype, backend: anytype, handler: anytype) aio.Error!void {
285286
if (comptime pairs.len > 1) {
286-
var ids: std.BoundedArray(aio.Id, pairs.len) = .{};
287+
var ids: BoundedArray(aio.Id, pairs.len) = .{};
287288
errdefer inline for (ids.constSlice(), pairs) |id, pair| {
288289
debug("dequeue: {f}: {any}, {s} ({?f})", .{ id, pair.tag, @tagName(pair.link), self.prev_id });
289290
backend.uringlator_dequeue(id, pair.tag, pair.op);

src/minilib.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ pub const FixedArrayList = @import("minilib/fixed_array_list.zig").FixedArrayLis
33
pub const DoubleBufferedFixedArrayList = @import("minilib/fixed_array_list.zig").DoubleBufferedFixedArrayList;
44
pub const Id = @import("minilib/id.zig").Id;
55
pub const TimerQueue = @import("minilib/TimerQueue.zig");
6+
pub const BoundedArray = @import("minilib/bounded_array.zig").BoundedArray;
67

78
const std = @import("std");
89

0 commit comments

Comments
 (0)