authorgravatar for justus@klausecker.deJustus Klausecker <justus@klausecker.de> 2026-01-09 04:43:31+01:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2026-01-11 11:37:17+00:00
log6e35138901d052f19d41ec7bafeaf31f1adf54f6
treea3a8badf0dc4394602abaaf2199572158f5adc17
parent9e949f95c15a7552f84209e01a78b5e0d12225db
signaturelock-open Commit is signed but in an unrecognized format.

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.

2 files changed, 3 insertions(+), 3 deletions(-)

lib/std/tar/Writer.zig+2-2
...@@ -114,7 +114,7 @@ fn writeHeader(...@@ -114,7 +114,7 @@ fn writeHeader(
114 if (typeflag == .symbolic_link)114 if (typeflag == .symbolic_link)
115 header.setLinkname(link_name) catch |err| switch (err) {115 header.setLinkname(link_name) catch |err| switch (err) {
116 error.NameTooLong => try w.writeExtendedHeader(.gnu_long_link, &.{link_name}),116 error.NameTooLong => try w.writeExtendedHeader(.gnu_long_link, &.{link_name}),
117 else => return err,117 else => |e| return e,
118 };118 };
119 try header.write(w.underlying_writer);119 try header.write(w.underlying_writer);
120}120}
...@@ -131,7 +131,7 @@ fn setPath(w: *Writer, header: *Header, sub_path: []const u8) Error!void {...@@ -131,7 +131,7 @@ fn setPath(w: *Writer, header: *Header, sub_path: []const u8) Error!void {
131 &.{ w.prefix, "/", sub_path };131 &.{ w.prefix, "/", sub_path };
132 try w.writeExtendedHeader(.gnu_long_name, buffers);132 try w.writeExtendedHeader(.gnu_long_name, buffers);
133 },133 },
134 else => return err,134 else => |e| return e,
135 };135 };
136}136}
137137
lib/std/testing.zig+1-1
...@@ -1187,7 +1187,7 @@ pub fn checkAllAllocationFailures(backing_allocator: std.mem.Allocator, comptime...@@ -1187,7 +1187,7 @@ pub fn checkAllAllocationFailures(backing_allocator: std.mem.Allocator, comptime
1187 return error.MemoryLeakDetected;1187 return error.MemoryLeakDetected;
1188 }1188 }
1189 },1189 },
1190 else => return err,1190 else => |e| return e,
1191 }1191 }
1192 }1192 }
1193}1193}