From 6e35138901d052f19d41ec7bafeaf31f1adf54f6 Mon Sep 17 00:00:00 2001 From: Justus Klausecker Date: Fri, 9 Jan 2026 04:43:31 +0100 Subject: [PATCH] all: prefer `else => |e| return e,` over `else => return err,` When switching on an error, using the captured value instead of the original one is always preferable since its error set has been narrowed to only contain errors which haven't already been handled by other switch prongs. The subsequent commits will disallow this form as an unreachable `else` prong. --- lib/std/tar/Writer.zig | 4 ++-- lib/std/testing.zig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/std/tar/Writer.zig b/lib/std/tar/Writer.zig index 583bc8cfc1c3b3ac75f4d39e9a38f46da4a90dcb..aa4d9b1bbbad4cf00c44ed3f3e495080c66f8d7f 100644 --- a/lib/std/tar/Writer.zig +++ b/lib/std/tar/Writer.zig @@ -114,7 +114,7 @@ fn writeHeader( if (typeflag == .symbolic_link) header.setLinkname(link_name) catch |err| switch (err) { error.NameTooLong => try w.writeExtendedHeader(.gnu_long_link, &.{link_name}), - else => return err, + else => |e| return e, }; try header.write(w.underlying_writer); } @@ -131,7 +131,7 @@ fn setPath(w: *Writer, header: *Header, sub_path: []const u8) Error!void { &.{ w.prefix, "/", sub_path }; try w.writeExtendedHeader(.gnu_long_name, buffers); }, - else => return err, + else => |e| return e, }; } diff --git a/lib/std/testing.zig b/lib/std/testing.zig index 24287f65aae647f217a5726c3d52c223e83889b2..6d2a045abb63f3182d0bc95d0905b762cfbff494 100644 --- a/lib/std/testing.zig +++ b/lib/std/testing.zig @@ -1187,7 +1187,7 @@ pub fn checkAllAllocationFailures(backing_allocator: std.mem.Allocator, comptime return error.MemoryLeakDetected; } }, - else => return err, + else => |e| return e, } } } -- 2.54.0