authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2025-12-16 12:05:40+00:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2025-12-22 11:54:57+00:00
log49f17237b0332680cebf3e4d83dedc3db46356e9
tree5e4611540299e30e6a7537291fec8d7389215aa8
parentaa0249d74e573742db3567f589fc6e4a00e1fff8
signaturelock-open Commit is signed but in an unrecognized format.

compiler,std: remove a handful of redundant discards

I'm embarrassed to say I didn't realise until a few days ago that you could omit the `_` capture for `if`/`while` on `E!void`...

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

lib/std/Io/Dir.zig+1-1
...@@ -322,7 +322,7 @@ pub fn makePathStatus(dir: Dir, io: Io, sub_path: []const u8) MakePathError!Make...@@ -322,7 +322,7 @@ pub fn makePathStatus(dir: Dir, io: Io, sub_path: []const u8) MakePathError!Make
322 var status: MakePathStatus = .existed;322 var status: MakePathStatus = .existed;
323 var component = it.last() orelse return error.BadPathName;323 var component = it.last() orelse return error.BadPathName;
324 while (true) {324 while (true) {
325 if (makeDir(dir, io, component.path)) |_| {325 if (makeDir(dir, io, component.path)) {
326 status = .created;326 status = .created;
327 } else |err| switch (err) {327 } else |err| switch (err) {
328 error.PathAlreadyExists => {328 error.PathAlreadyExists => {
lib/std/Io/File.zig+1-1
...@@ -419,7 +419,7 @@ pub const Reader = struct {...@@ -419,7 +419,7 @@ pub const Reader = struct {
419 },419 },
420 .streaming, .streaming_reading => {420 .streaming, .streaming_reading => {
421 const seek_err = r.seek_err orelse e: {421 const seek_err = r.seek_err orelse e: {
422 if (io.vtable.fileSeekBy(io.userdata, r.file, offset)) |_| {422 if (io.vtable.fileSeekBy(io.userdata, r.file, offset)) {
423 setLogicalPos(r, @intCast(@as(i64, @intCast(logicalPos(r))) + offset));423 setLogicalPos(r, @intCast(@as(i64, @intCast(logicalPos(r))) + offset));
424 return;424 return;
425 } else |err| {425 } else |err| {
src/Sema.zig+5-5
...@@ -1061,7 +1061,7 @@ fn analyzeInlineBody(...@@ -1061,7 +1061,7 @@ fn analyzeInlineBody(
1061 /// The index which a break instruction can target to break from this body.1061 /// The index which a break instruction can target to break from this body.
1062 break_target: Zir.Inst.Index,1062 break_target: Zir.Inst.Index,
1063) CompileError!?Air.Inst.Ref {1063) CompileError!?Air.Inst.Ref {
1064 if (sema.analyzeBodyInner(block, body)) |_| {1064 if (sema.analyzeBodyInner(block, body)) {
1065 return null;1065 return null;
1066 } else |err| switch (err) {1066 } else |err| switch (err) {
1067 error.ComptimeBreak => {},1067 error.ComptimeBreak => {},
...@@ -1808,7 +1808,7 @@ fn analyzeBodyInner(...@@ -1808,7 +1808,7 @@ fn analyzeBodyInner(
1808 child_block.instructions = block.instructions;1808 child_block.instructions = block.instructions;
1809 defer block.instructions = child_block.instructions;1809 defer block.instructions = child_block.instructions;
18101810
1811 const break_result: ?BreakResult = if (sema.analyzeBodyInner(&child_block, inline_body)) |_| r: {1811 const break_result: ?BreakResult = if (sema.analyzeBodyInner(&child_block, inline_body)) r: {
1812 break :r null;1812 break :r null;
1813 } else |err| switch (err) {1813 } else |err| switch (err) {
1814 error.ComptimeBreak => brk_res: {1814 error.ComptimeBreak => brk_res: {
...@@ -1956,7 +1956,7 @@ fn analyzeBodyInner(...@@ -1956,7 +1956,7 @@ fn analyzeBodyInner(
1956 .@"defer" => blk: {1956 .@"defer" => blk: {
1957 const inst_data = sema.code.instructions.items(.data)[@intFromEnum(inst)].@"defer";1957 const inst_data = sema.code.instructions.items(.data)[@intFromEnum(inst)].@"defer";
1958 const defer_body = sema.code.bodySlice(inst_data.index, inst_data.len);1958 const defer_body = sema.code.bodySlice(inst_data.index, inst_data.len);
1959 if (sema.analyzeBodyInner(block, defer_body)) |_| {1959 if (sema.analyzeBodyInner(block, defer_body)) {
1960 // The defer terminated noreturn - no more analysis needed.1960 // The defer terminated noreturn - no more analysis needed.
1961 break;1961 break;
1962 } else |err| switch (err) {1962 } else |err| switch (err) {
...@@ -1975,7 +1975,7 @@ fn analyzeBodyInner(...@@ -1975,7 +1975,7 @@ fn analyzeBodyInner(
1975 const err_code = try sema.resolveInst(inst_data.err_code);1975 const err_code = try sema.resolveInst(inst_data.err_code);
1976 try map.ensureSpaceForInstructions(sema.gpa, defer_body);1976 try map.ensureSpaceForInstructions(sema.gpa, defer_body);
1977 map.putAssumeCapacity(extra.remapped_err_code, err_code);1977 map.putAssumeCapacity(extra.remapped_err_code, err_code);
1978 if (sema.analyzeBodyInner(block, defer_body)) |_| {1978 if (sema.analyzeBodyInner(block, defer_body)) {
1979 // The defer terminated noreturn - no more analysis needed.1979 // The defer terminated noreturn - no more analysis needed.
1980 break;1980 break;
1981 } else |err| switch (err) {1981 } else |err| switch (err) {
...@@ -5959,7 +5959,7 @@ fn resolveBlockBody(...@@ -5959,7 +5959,7 @@ fn resolveBlockBody(
5959 assert(sema.air_instructions.items(.tag)[@intFromEnum(merges.block_inst)] == .block);5959 assert(sema.air_instructions.items(.tag)[@intFromEnum(merges.block_inst)] == .block);
5960 var need_debug_scope = false;5960 var need_debug_scope = false;
5961 child_block.need_debug_scope = &need_debug_scope;5961 child_block.need_debug_scope = &need_debug_scope;
5962 if (sema.analyzeBodyInner(child_block, body)) |_| {5962 if (sema.analyzeBodyInner(child_block, body)) {
5963 return sema.resolveAnalyzedBlock(parent_block, src, child_block, merges, need_debug_scope);5963 return sema.resolveAnalyzedBlock(parent_block, src, child_block, merges, need_debug_scope);
5964 } else |err| switch (err) {5964 } else |err| switch (err) {
5965 error.ComptimeBreak => {5965 error.ComptimeBreak => {