From 30c2921eb87c3157d52edd7d8ee874209a0f7538 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 3 Jul 2025 18:30:07 -0700
Subject: compiler: update a bunch of format strings

---
 src/codegen/c.zig          | 12 ++----------
 src/codegen/spirv.zig      |  8 ++++----
 src/codegen/spirv/spec.zig | 11 ++++-------
 3 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'src/codegen')

diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index a0bf0e271b..a06ce22b92 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -388,7 +388,7 @@ fn formatCTypePoolString(data: CTypePoolStringFormatData, w: *std.io.Writer) std
     if (data.ctype_pool_string.toSlice(data.ctype_pool)) |slice|
         try formatIdentOptions(slice, w, data.solo)
     else
-        try w.print("{}", .{data.ctype_pool_string.fmt(data.ctype_pool)});
+        try w.print("{f}", .{data.ctype_pool_string.fmt(data.ctype_pool)});
 }
 pub fn fmtCTypePoolString(
     ctype_pool_string: CType.Pool.String,
@@ -2471,15 +2471,7 @@ const RenderCTypeTrailing = enum {
     no_space,
     maybe_space,
 
-    pub fn format(
-        self: @This(),
-        comptime fmt: []const u8,
-        _: std.fmt.FormatOptions,
-        w: *Writer,
-    ) @TypeOf(w).Error!void {
-        if (fmt.len != 0)
-            @compileError("invalid format string '" ++ fmt ++ "' for type '" ++
-                @typeName(@This()) ++ "'");
+    pub fn format(self: @This(), w: *Writer, comptime fmt: []const u8) Writer.Error!void {
         comptime assert(fmt.len == 0);
         switch (self) {
             .no_space => {},
diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig
index 901687d40b..f263e567e8 100644
--- a/src/codegen/spirv.zig
+++ b/src/codegen/spirv.zig
@@ -817,7 +817,7 @@ const NavGen = struct {
         const result_ty_id = try self.resolveType(ty, repr);
         const ip = &zcu.intern_pool;
 
-        log.debug("lowering constant: ty = {}, val = {}, key = {s}", .{ ty.fmt(pt), val.fmtValue(pt), @tagName(ip.indexToKey(val.toIntern())) });
+        log.debug("lowering constant: ty = {f}, val = {f}, key = {s}", .{ ty.fmt(pt), val.fmtValue(pt), @tagName(ip.indexToKey(val.toIntern())) });
         if (val.isUndefDeep(zcu)) {
             return self.spv.constUndef(result_ty_id);
         }
@@ -1147,7 +1147,7 @@ const NavGen = struct {
                     return result_ptr_id;
                 }
 
-                return self.fail("cannot perform pointer cast: '{}' to '{}'", .{
+                return self.fail("cannot perform pointer cast: '{f}' to '{f}'", .{
                     parent_ptr_ty.fmt(pt),
                     oac.new_ptr_ty.fmt(pt),
                 });
@@ -1464,7 +1464,7 @@ const NavGen = struct {
         const pt = self.pt;
         const zcu = pt.zcu;
         const ip = &zcu.intern_pool;
-        log.debug("resolveType: ty = {}", .{ty.fmt(pt)});
+        log.debug("resolveType: ty = {f}", .{ty.fmt(pt)});
         const target = self.spv.target;
 
         const section = &self.spv.sections.types_globals_constants;
@@ -3070,7 +3070,7 @@ const NavGen = struct {
                     try self.func.body.emit(self.spv.gpa, .OpFunctionEnd, {});
                     try self.spv.addFunction(spv_decl_index, self.func);
 
-                    try self.spv.debugNameFmt(initializer_id, "initializer of {}", .{nav.fqn.fmt(ip)});
+                    try self.spv.debugNameFmt(initializer_id, "initializer of {f}", .{nav.fqn.fmt(ip)});
 
                     try self.spv.sections.types_globals_constants.emit(self.spv.gpa, .OpExtInst, .{
                         .id_result_type = ptr_ty_id,
diff --git a/src/codegen/spirv/spec.zig b/src/codegen/spirv/spec.zig
index 970f5bfe7f..588815a413 100644
--- a/src/codegen/spirv/spec.zig
+++ b/src/codegen/spirv/spec.zig
@@ -1,6 +1,7 @@
 //! This file is auto-generated by tools/gen_spirv_spec.zig.
 
 const std = @import("std");
+const assert = std.debug.assert;
 
 pub const Version = packed struct(Word) {
     padding: u8 = 0,
@@ -18,15 +19,11 @@ pub const IdResult = enum(Word) {
     none,
     _,
 
-    pub fn format(
-        self: IdResult,
-        comptime _: []const u8,
-        _: std.fmt.FormatOptions,
-        writer: anytype,
-    ) @TypeOf(writer).Error!void {
+    pub fn format(self: IdResult, writer: *std.io.Writer, comptime f: []const u8) std.io.Writer.Error!void {
+        comptime assert(f.len == 0);
         switch (self) {
             .none => try writer.writeAll("(none)"),
-            else => try writer.print("%{}", .{@intFromEnum(self)}),
+            else => try writer.print("%{d}", .{@intFromEnum(self)}),
         }
     }
 };
-- 
cgit v1.2.3