diff options
Diffstat (limited to 'lib/std/Thread.zig')
| -rw-r--r-- | lib/std/Thread.zig | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig index adb822173e..5bfaef6127 100644 --- a/lib/std/Thread.zig +++ b/lib/std/Thread.zig @@ -398,7 +398,7 @@ fn callFn(comptime f: anytype, args: anytype) switch (Impl) { else => unreachable, } { const default_value = if (Impl == PosixThreadImpl) null else 0; - const bad_fn_ret = "expected return type of startFn to be 'u8', 'noreturn', 'void', or '!void'"; + const bad_fn_ret = "expected return type of startFn to be 'u8', 'noreturn', '!noreturn', 'void', or '!void'"; switch (@typeInfo(@typeInfo(@TypeOf(f)).Fn.return_type.?)) { .NoReturn => { @@ -422,18 +422,21 @@ fn callFn(comptime f: anytype, args: anytype) switch (Impl) { return default_value; }, .ErrorUnion => |info| { - if (info.payload != void) { - @compileError(bad_fn_ret); - } - - @call(.auto, f, args) catch |err| { - std.debug.print("error: {s}\n", .{@errorName(err)}); - if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); - } - }; + switch (info.payload) { + void, noreturn => { + @call(.auto, f, args) catch |err| { + std.debug.print("error: {s}\n", .{@errorName(err)}); + if (@errorReturnTrace()) |trace| { + std.debug.dumpStackTrace(trace.*); + } + }; - return default_value; + return default_value; + }, + else => { + @compileError(bad_fn_ret); + }, + } }, else => { @compileError(bad_fn_ret); |