misc cleanup

Author: scheibo

build.zig

@@ -42,8 +42,8 @@ pub fn build(b: *std.Build) !void {
     const wasm_stack_size =
         b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
     const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
-    const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse null;
-    const pic = b.option(bool, "pic", "Force position independent code") orelse null;
+    const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
+    const pic = b.option(bool, "pic", "Force position independent code");
     const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
     const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
 

src/lib/bindings/c.zig

@@ -23,7 +23,7 @@ pub const MAX_LOGS = pkmn.MAX_LOGS;
 pub const LOGS_SIZE = pkmn.LOGS_SIZE;
 
 pub fn choice_init(choice: u8, data: u8) callconv(.c) u8 {
-    assert(choice <= @field(@typeInfo(pkmn.Choice.Type), @tagName(.@"enum")).fields.len);
+    assert(choice <= @typeInfo(pkmn.Choice.Type).@"enum".fields.len);
     assert(data <= 6);
     return @bitCast(pkmn.Choice{ .type = @enumFromInt(choice), .data = @intCast(data) });
 }
@@ -190,8 +190,8 @@ pub fn gen(comptime num: comptime_int) type {
             out: [*]u8,
             n: usize,
         ) callconv(.c) u8 {
-            assert(player <= @field(@typeInfo(pkmn.Player), @tagName(.@"enum")).fields.len);
-            assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(.@"enum")).fields.len);
+            assert(player <= @typeInfo(pkmn.Player).@"enum".fields.len);
+            assert(request <= @typeInfo(pkmn.Choice.Type).@"enum".fields.len);
 
             assert(!pkmn.options.showdown or n > 0);
             return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(out[0..n]));

src/lib/bindings/wasm.zig

@@ -36,8 +36,8 @@ pub fn gen(comptime num: comptime_int) type {
             request: u8,
             buf: [*]u8,
         ) callconv(.c) u8 {
-            assert(player <= @field(@typeInfo(pkmn.Player), @tagName(.@"enum")).fields.len);
-            assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(.@"enum")).fields.len);
+            assert(player <= @typeInfo(pkmn.Player).@"enum".fields.len);
+            assert(request <= @typeInfo(pkmn.Choice.Type).@"enum".fields.len);
 
             const n = CHOICES_SIZE;
             return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..n]));

src/lib/common/util.zig

@@ -4,7 +4,7 @@ const expect = std.testing.expect;
 const expectEqual = std.testing.expectEqual;
 
 pub fn PointerType(comptime P: type, comptime C: type) type {
-    return if (@field(@typeInfo(P), @tagName(.pointer)).is_const) *const C else *C;
+    return if (@typeInfo(P).pointer.is_const) *const C else *C;
 }
 
 test PointerType {
@@ -15,7 +15,7 @@ test PointerType {
 pub fn isPointerTo(p: anytype, comptime P: type) bool {
     const info = @typeInfo(@TypeOf(p));
     return switch (info) {
-        .pointer => @field(info, @tagName(.pointer)).child == P,
+        .pointer => info.pointer.child == P,
         else => false,
     };
 }

src/lib/gen1/test.zig

@@ -6864,7 +6864,6 @@ test "Hyper Beam + Substitute bug" {
     try t.verify();
 }
 
-//                 .{ HIT, 1 } ++ @as([30]U, @splat(.{ ~CRIT, HIT }),
 test "Mimic infinite PP bug" {
     // Mimic first
     {

src/tools/release.ts

@@ -47,7 +47,7 @@ const TARGETS = [
 let version: string = sh('zig', ['version'], {bypass: true}).trim();
 if (!version.endsWith('.patched')) {
   // TODO: ziglang/zig#17768
-  console.error('Releases must be build with a patched compiler for performance.');
+  console.error('Releases must be built with a patched compiler for performance.');
   process.exit(1);
 }