From 4aeb2cc77f41e18e36fd868111c40281096a52fd Mon Sep 17 00:00:00 2001
From: Matt Knight <mattnite@protonmail.com>
Date: Tue, 27 Jun 2023 20:09:33 -0700
Subject: [PATCH] builtin type inference fix (#15)

---
 tools/uf2/src/elf2uf2.zig |  2 +-
 tools/uf2/src/uf2.zig     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/uf2/src/elf2uf2.zig b/tools/uf2/src/elf2uf2.zig
index 96e5d9f..f1786d3 100644
--- a/tools/uf2/src/elf2uf2.zig
+++ b/tools/uf2/src/elf2uf2.zig
@@ -58,7 +58,7 @@ pub fn main() !void {
 
     const family_id: ?uf2.FamilyId = if (try find_arg(args, "--family-id")) |family_id_str|
         if (std.mem.startsWith(u8, family_id_str, "0x"))
-            @enumFromInt(uf2.FamilyId, try std.fmt.parseInt(u32, family_id_str, 0))
+            @as(uf2.FamilyId, @enumFromInt(try std.fmt.parseInt(u32, family_id_str, 0)))
         else
             std.meta.stringToEnum(uf2.FamilyId, family_id_str) orelse {
                 std.log.err("invalid family id: {s}, valid family names are:", .{family_id_str});
diff --git a/tools/uf2/src/uf2.zig b/tools/uf2/src/uf2.zig
index 861dc1a..c5d17ad 100644
--- a/tools/uf2/src/uf2.zig
+++ b/tools/uf2/src/uf2.zig
@@ -61,9 +61,9 @@ pub const Archive = struct {
         while (try it.next()) |prog_hdr|
             if (prog_hdr.p_type == std.elf.PT_LOAD and prog_hdr.p_memsz > 0 and prog_hdr.p_filesz > 0) {
                 try segments.append(.{
-                    .addr = @intCast(u32, prog_hdr.p_paddr),
-                    .file_offset = @intCast(u32, prog_hdr.p_offset),
-                    .size = @intCast(u32, prog_hdr.p_memsz),
+                    .addr = @as(u32, @intCast(prog_hdr.p_paddr)),
+                    .file_offset = @as(u32, @intCast(prog_hdr.p_offset)),
+                    .size = @as(u32, @intCast(prog_hdr.p_memsz)),
                 });
             };
 
@@ -134,7 +134,7 @@ pub const Archive = struct {
                     .family_id = if (opts.family_id) |family_id|
                         family_id
                     else
-                        @enumFromInt(FamilyId, 0),
+                        @as(FamilyId, @enumFromInt(0)),
                 },
                 .data = std.mem.zeroes([476]u8),
             });
@@ -172,8 +172,8 @@ pub const Archive = struct {
 
     pub fn write_to(self: *Self, writer: anytype) !void {
         for (self.blocks.items, 0..) |*block, i| {
-            block.block_number = @intCast(u32, i);
-            block.total_blocks = @intCast(u32, self.blocks.items.len);
+            block.block_number = @as(u32, @intCast(i));
+            block.total_blocks = @as(u32, @intCast(self.blocks.items.len));
             try block.write_to(writer);
         }
     }
@@ -302,7 +302,7 @@ pub const Block = extern struct {
                 else => {
                     assert(4 == @sizeOf(field.type));
                     @field(block, field.name) =
-                        @bitCast(field.type, try reader.readIntLittle(u32));
+                        @as(field.type, @bitCast(try reader.readIntLittle(u32)));
                 },
             }
         }
@@ -319,7 +319,7 @@ pub const Block = extern struct {
                     assert(4 == @sizeOf(field.type));
                     try writer.writeIntLittle(
                         u32,
-                        @bitCast(u32, @field(self, field.name)),
+                        @as(u32, @bitCast(@field(self, field.name))),
                     );
                 },
             }
@@ -355,7 +355,7 @@ test "Block loopback" {
     var prng = std.rand.DefaultPrng.init(0xf163bfab);
     var rand = prng.random();
     var expected = Block{
-        .flags = @bitCast(Flags, rand.int(u32)),
+        .flags = @as(Flags, @bitCast(rand.int(u32))),
         .target_addr = rand.int(u32),
         .payload_size = rand.int(u32),
         .block_number = rand.int(u32),