archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 01:24:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Allow async and concurrent from Io.Select to accept non-void error unions

Browse source
This commit is contained in:
estevesnp 2026-02-25 16:14:44 +00:00 • committed by Andrew Kelley
parent 2d867223be
commit 0b6b65b387
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/std/Io.zig
View file

@ -1238,7 +1238,7 @@ pub fn Select(comptime U: type) type {
error.Closed => unreachable,
};
if (@typeInfo(@TypeOf(raw_result)) == .error_union)
raw_result catch |err| if (err == error.Canceled) return error.Canceled;
_ = raw_result catch |err| if (err == error.Canceled) return error.Canceled;
}
};
const context: Context = .{ .select = s, .args = args };
@ -1277,7 +1277,7 @@ pub fn Select(comptime U: type) type {
error.Closed => unreachable,
};
if (@typeInfo(@TypeOf(raw_result)) == .error_union)
raw_result catch |err| if (err == error.Canceled) return error.Canceled;
_ = raw_result catch |err| if (err == error.Canceled) return error.Canceled;
}
};
const context: Context = .{ .select = s, .args = args };

16
lib/std/Io/test.zig
View file

@ -820,6 +820,10 @@ test "Select" {
fn bar(io: Io) Io.Cancelable!void {
try io.sleep(.fromSeconds(300), .awake);
}
fn baz() error{Ignored}!u8 {
return 42;
}
};
const io = testing.io;
@ -827,6 +831,7 @@ test "Select" {
const U = union(enum) {
foo: bool,
bar: Io.Cancelable!void,
baz: error{Ignored}!u8,
};
var buffer: [4]U = undefined;
var select: Io.Select(U) = .init(io, &buffer);
@ -840,6 +845,7 @@ test "Select" {
switch (try select.await()) {
.foo => {},
.bar => return error.TestFailed, // should be sleeping
.baz => return error.TestFailed, // not called yet
}
select.async(.foo, S.foo, .{});
select.async(.foo, S.foo, .{});
@ -847,4 +853,14 @@ test "Select" {
var finished_buffer: [3]U = undefined;
const finished = finished_buffer[0..try select.awaitMany(&finished_buffer, 2)];
try testing.expectEqualSlices(U, &.{ .{ .foo = true }, .{ .foo = true } }, finished);
select.async(.baz, S.baz, .{});
const result = switch (try select.await()) {
.baz => |n| try n,
.foo => return error.TestFailed, // not called
.bar => return error.TestFailed, // should be sleeping
};
try testing.expectEqual(42, result);
}