authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-10-22 21:07:03-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-10-22 21:07:03-07:00
logfa4f5b26292dc1264a844815f60aacde7a3212a3
tree590a52ee328b84af62b318b4c2238ce1acdc8830
parent70c86e11c4003550375f963db9258b230033309d

fix compilation of test/Runner.zig

it was an invisible merge conflict

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

test/Runner.zig+3-3
...@@ -204,7 +204,7 @@ pub const Target = struct {...@@ -204,7 +204,7 @@ pub const Target = struct {
204 var query: std.Target.Query = .{};204 var query: std.Target.Query = .{};
205 query.cpu_arch = switch (target.cpu) {205 query.cpu_arch = switch (target.cpu) {
206 .native => null,206 .native => null,
207 else => |_, arch| @fromBackingInt(@backingInt(arch)),207 else => |arch| @fromBackingInt(@backingInt(arch)),
208 };208 };
209 switch (target.cpu) {209 switch (target.cpu) {
210 .native => |native| query.cpu_model = switch (native.model) {210 .native => |native| query.cpu_model = switch (native.model) {
...@@ -215,7 +215,7 @@ pub const Target = struct {...@@ -215,7 +215,7 @@ pub const Target = struct {
215 }215 }
216 query.os_tag = switch (target.os) {216 query.os_tag = switch (target.os) {
217 .native => null,217 .native => null,
218 else => |_, os| @fromBackingInt(@backingInt(os)),218 else => |os| @fromBackingInt(@backingInt(os)),
219 };219 };
220 switch (target.os) {220 switch (target.os) {
221 .native => {},221 .native => {},
...@@ -223,7 +223,7 @@ pub const Target = struct {...@@ -223,7 +223,7 @@ pub const Target = struct {
223 }223 }
224 query.abi = switch (target.abi) {224 query.abi = switch (target.abi) {
225 .default => null,225 .default => null,
226 else => |_, abi| @fromBackingInt(@backingInt(abi)),226 else => |abi| @fromBackingInt(@backingInt(abi)),
227 };227 };
228 switch (target.abi) {228 switch (target.abi) {
229 .default => {},229 .default => {},