allow noreturn in Pool.zig

ziglang · Nov 11, 2024 · 5385460 · 5385460
1 parent cd204ed
commit 5385460
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/lib/std/Thread/Pool.zig b/lib/std/Thread/Pool.zig
@@ -323,23 +323,26 @@ pub fn getIdCount(pool: *Pool) usize {
 }
 
 inline fn callFn(comptime f: anytype, args: anytype) void {
-    const bad_fn_ret = "expected return type of runFn to be 'void', or '!void'";
+    const bad_fn_ret = "expected return type of runFn to be 'void', '!void', noreturn, or !noreturn";
 
     switch (@typeInfo(@typeInfo(@TypeOf(f)).@"fn".return_type.?)) {
-        .void => {
+        .void, .noreturn => {
             @call(.auto, f, args);
         },
         .error_union => |info| {
-            if (info.payload != void) {
-                @compileError(bad_fn_ret);
+            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.*);
+                        }
+                    };
+                },
+                else => {
+                    @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.*);
-                }
-            };
         },
         else => {
             @compileError(bad_fn_ret);