From 106850fd4cc218f77d5b37738095c7afd7d7b74b Mon Sep 17 00:00:00 2001 From: Matthew Lugg Date: Tue, 28 Apr 2026 12:56:38 +0100 Subject: [PATCH] tests: remove uses of `void{}` In preparation for this syntax to be removed from the language per https://github.com/ziglang/zig/issues/15213. --- test/behavior/array.zig | 2 +- test/behavior/basic.zig | 2 +- test/behavior/fn.zig | 2 +- test/behavior/reflection.zig | 2 +- test/behavior/struct.zig | 4 ++-- test/standalone/cmakedefine/build.zig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/behavior/array.zig b/test/behavior/array.zig index 2f3aa841bc58fc9494e88f0c918744c4de0eb0e5..c6e6c3030cbcf8b4c47a20c3d9660ebf0715929d 100644 --- a/test/behavior/array.zig +++ b/test/behavior/array.zig @@ -196,7 +196,7 @@ test "array with sentinels" { test "void arrays" { var array: [4]void = undefined; - array[0] = void{}; + array[0] = {}; array[1] = array[2]; try expect(@sizeOf(@TypeOf(array)) == 0); try expect(array.len == 4); diff --git a/test/behavior/basic.zig b/test/behavior/basic.zig index 60bd0d69330cf832eeb0bbe7a20333d03caeea0d..bfc90b6112e25e626840b42759da46ca3d866e7e 100644 --- a/test/behavior/basic.zig +++ b/test/behavior/basic.zig @@ -465,7 +465,7 @@ fn testPointerToVoidReturnType() anyerror!void { const a = testPointerToVoidReturnType2(); return a.*; } -const test_pointer_to_void_return_type_x = void{}; +const test_pointer_to_void_return_type_x = {}; fn testPointerToVoidReturnType2() *const void { return &test_pointer_to_void_return_type_x; } diff --git a/test/behavior/fn.zig b/test/behavior/fn.zig index aa6ca41c74d6bd95f52dc53800e3008c172d33e3..2d0fb4b4db1696905d2e0f215c539f26ec9dea1d 100644 --- a/test/behavior/fn.zig +++ b/test/behavior/fn.zig @@ -280,7 +280,7 @@ test "implicit cast fn call result to optional in field result" { test "void parameters" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; - try voidFun(1, void{}, 2, {}); + try voidFun(1, {}, 2, {}); } fn voidFun(a: i32, b: void, c: i32, d: void) !void { _ = d; diff --git a/test/behavior/reflection.zig b/test/behavior/reflection.zig index 3f9e6f35eb6c42e29d93d927268041be92ab931a..b3f29da414792fa9610609d72bb9d9d227a9e1d8 100644 --- a/test/behavior/reflection.zig +++ b/test/behavior/reflection.zig @@ -31,7 +31,7 @@ test "reflection: @field" { var f = Foo{ .one = 42, .two = true, - .three = void{}, + .three = {}, }; try expect(f.one == f.one); diff --git a/test/behavior/struct.zig b/test/behavior/struct.zig index 2295d06db13b8e888d225408098f2633381a251b..6870c6227db10e3f154885625c813bcd66b51977 100644 --- a/test/behavior/struct.zig +++ b/test/behavior/struct.zig @@ -295,9 +295,9 @@ test "void struct fields" { if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO const foo = VoidStructFieldsFoo{ - .a = void{}, + .a = {}, .b = 1, - .c = void{}, + .c = {}, }; try expect(foo.b == 1); try expect(@sizeOf(VoidStructFieldsFoo) == 4); diff --git a/test/standalone/cmakedefine/build.zig b/test/standalone/cmakedefine/build.zig index 3dc0ec3046a2867afc2414687735e0e2fd5fad8f..a7a395b00c1a3c17495161185cd8118b4c839636 100644 --- a/test/standalone/cmakedefine/build.zig +++ b/test/standalone/cmakedefine/build.zig @@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void { .tenval = 10, .stringval = "test", - .boolnoval = void{}, + .boolnoval = {}, .booltrueval = true, .boolfalseval = false, .boolzeroval = 0, -- 2.54.0