diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2025-08-30 14:50:33 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2025-08-31 12:49:18 -0700 |
| commit | 150169f1e0cf08d4b76fed81fc205a63177b6e01 (patch) | |
| tree | c39318b34c361a9a5a8ddaa1aae80cba1fe27f0c /src | |
| parent | ab99dd9c5d22a3d927453081654b1f75b2521b48 (diff) | |
| download | zig-150169f1e0cf08d4b76fed81fc205a63177b6e01.tar.gz zig-150169f1e0cf08d4b76fed81fc205a63177b6e01.zip | |
std.fmt: delete deprecated APIs
std.fmt.Formatter -> std.fmt.Alt
std.fmt.format -> std.Io.Writer.print
Diffstat (limited to 'src')
40 files changed, 91 insertions, 91 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 7e485aca46..85c4f49bf6 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -6465,7 +6465,7 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32 }; } - pub fn fmtRcEscape(bytes: []const u8) std.fmt.Formatter([]const u8, formatRcEscape) { + pub fn fmtRcEscape(bytes: []const u8) std.fmt.Alt([]const u8, formatRcEscape) { return .{ .data = bytes }; } }.fmtRcEscape; diff --git a/src/InternPool.zig b/src/InternPool.zig index fd8515263c..9965497742 100644 --- a/src/InternPool.zig +++ b/src/InternPool.zig @@ -1904,11 +1904,11 @@ pub const NullTerminatedString = enum(u32) { } } - pub fn fmt(string: NullTerminatedString, ip: *const InternPool) std.fmt.Formatter(FormatData, format) { + pub fn fmt(string: NullTerminatedString, ip: *const InternPool) std.fmt.Alt(FormatData, format) { return .{ .data = .{ .string = string, .ip = ip, .id = false } }; } - pub fn fmtId(string: NullTerminatedString, ip: *const InternPool) std.fmt.Formatter(FormatData, format) { + pub fn fmtId(string: NullTerminatedString, ip: *const InternPool) std.fmt.Alt(FormatData, format) { return .{ .data = .{ .string = string, .ip = ip, .id = true } }; } diff --git a/src/Type.zig b/src/Type.zig index d1685fe5a6..3cdd48c3f3 100644 --- a/src/Type.zig +++ b/src/Type.zig @@ -127,7 +127,7 @@ pub fn format(ty: Type, writer: *std.Io.Writer) !void { @compileError("do not format types directly; use either ty.fmtDebug() or ty.fmt()"); } -pub const Formatter = std.fmt.Formatter(Format, Format.default); +pub const Formatter = std.fmt.Alt(Format, Format.default); pub fn fmt(ty: Type, pt: Zcu.PerThread) Formatter { return .{ .data = .{ @@ -145,7 +145,7 @@ const Format = struct { } }; -pub fn fmtDebug(ty: Type) std.fmt.Formatter(Type, dump) { +pub fn fmtDebug(ty: Type) std.fmt.Alt(Type, dump) { return .{ .data = ty }; } diff --git a/src/Value.zig b/src/Value.zig index 0badae7cee..e0afc6ca4e 100644 --- a/src/Value.zig +++ b/src/Value.zig @@ -27,11 +27,11 @@ pub fn dump(start_val: Value, w: std.Io.Writer) std.Io.Writer.Error!void { try w.print("(interned: {})", .{start_val.toIntern()}); } -pub fn fmtDebug(val: Value) std.fmt.Formatter(Value, dump) { +pub fn fmtDebug(val: Value) std.fmt.Alt(Value, dump) { return .{ .data = val }; } -pub fn fmtValue(val: Value, pt: Zcu.PerThread) std.fmt.Formatter(print_value.FormatContext, print_value.format) { +pub fn fmtValue(val: Value, pt: Zcu.PerThread) std.fmt.Alt(print_value.FormatContext, print_value.format) { return .{ .data = .{ .val = val, .pt = pt, @@ -40,7 +40,7 @@ pub fn fmtValue(val: Value, pt: Zcu.PerThread) std.fmt.Formatter(print_value.For } }; } -pub fn fmtValueSema(val: Value, pt: Zcu.PerThread, sema: *Sema) std.fmt.Formatter(print_value.FormatContext, print_value.formatSema) { +pub fn fmtValueSema(val: Value, pt: Zcu.PerThread, sema: *Sema) std.fmt.Alt(print_value.FormatContext, print_value.formatSema) { return .{ .data = .{ .val = val, .pt = pt, @@ -49,7 +49,7 @@ pub fn fmtValueSema(val: Value, pt: Zcu.PerThread, sema: *Sema) std.fmt.Formatte } }; } -pub fn fmtValueSemaFull(ctx: print_value.FormatContext) std.fmt.Formatter(print_value.FormatContext, print_value.formatSema) { +pub fn fmtValueSemaFull(ctx: print_value.FormatContext) std.fmt.Alt(print_value.FormatContext, print_value.formatSema) { return .{ .data = ctx }; } diff --git a/src/Zcu.zig b/src/Zcu.zig index 3f5cf1d5fd..d86f422b98 100644 --- a/src/Zcu.zig +++ b/src/Zcu.zig @@ -4306,10 +4306,10 @@ pub fn navFileScope(zcu: *Zcu, nav: InternPool.Nav.Index) *File { return zcu.fileByIndex(zcu.navFileScopeIndex(nav)); } -pub fn fmtAnalUnit(zcu: *Zcu, unit: AnalUnit) std.fmt.Formatter(FormatAnalUnit, formatAnalUnit) { +pub fn fmtAnalUnit(zcu: *Zcu, unit: AnalUnit) std.fmt.Alt(FormatAnalUnit, formatAnalUnit) { return .{ .data = .{ .unit = unit, .zcu = zcu } }; } -pub fn fmtDependee(zcu: *Zcu, d: InternPool.Dependee) std.fmt.Formatter(FormatDependee, formatDependee) { +pub fn fmtDependee(zcu: *Zcu, d: InternPool.Dependee) std.fmt.Alt(FormatDependee, formatDependee) { return .{ .data = .{ .dependee = d, .zcu = zcu } }; } diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index c5aa5f4201..7b13cfc90d 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -972,7 +972,7 @@ fn formatWipMir(data: FormatWipMirData, writer: *std.Io.Writer) std.Io.Writer.Er first = false; } } -fn fmtWipMir(func: *Func, inst: Mir.Inst.Index) std.fmt.Formatter(FormatWipMirData, formatWipMir) { +fn fmtWipMir(func: *Func, inst: Mir.Inst.Index) std.fmt.Alt(FormatWipMirData, formatWipMir) { return .{ .data = .{ .func = func, .inst = inst } }; } @@ -983,7 +983,7 @@ const FormatNavData = struct { fn formatNav(data: FormatNavData, writer: *std.Io.Writer) std.Io.Writer.Error!void { try writer.print("{f}", .{data.ip.getNav(data.nav_index).fqn.fmt(data.ip)}); } -fn fmtNav(nav_index: InternPool.Nav.Index, ip: *const InternPool) std.fmt.Formatter(FormatNavData, formatNav) { +fn fmtNav(nav_index: InternPool.Nav.Index, ip: *const InternPool) std.fmt.Alt(FormatNavData, formatNav) { return .{ .data = .{ .ip = ip, .nav_index = nav_index, @@ -1001,7 +1001,7 @@ fn formatAir(data: FormatAirData, writer: *std.Io.Writer) std.Io.Writer.Error!vo _ = writer; @panic("unimplemented"); } -fn fmtAir(func: *Func, inst: Air.Inst.Index) std.fmt.Formatter(FormatAirData, formatAir) { +fn fmtAir(func: *Func, inst: Air.Inst.Index) std.fmt.Alt(FormatAirData, formatAir) { return .{ .data = .{ .func = func, .inst = inst } }; } @@ -1012,7 +1012,7 @@ fn formatTracking(data: FormatTrackingData, writer: *std.Io.Writer) std.Io.Write var it = data.func.inst_tracking.iterator(); while (it.next()) |entry| try writer.print("\n%{d} = {f}", .{ entry.key_ptr.*, entry.value_ptr.* }); } -fn fmtTracking(func: *Func) std.fmt.Formatter(FormatTrackingData, formatTracking) { +fn fmtTracking(func: *Func) std.fmt.Alt(FormatTrackingData, formatTracking) { return .{ .data = .{ .func = func } }; } diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index e975fbf8bb..1d3792d785 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -1091,7 +1091,7 @@ const FormatNavData = struct { fn formatNav(data: FormatNavData, w: *Writer) Writer.Error!void { try w.print("{f}", .{data.ip.getNav(data.nav_index).fqn.fmt(data.ip)}); } -fn fmtNav(nav_index: InternPool.Nav.Index, ip: *const InternPool) std.fmt.Formatter(FormatNavData, formatNav) { +fn fmtNav(nav_index: InternPool.Nav.Index, ip: *const InternPool) std.fmt.Alt(FormatNavData, formatNav) { return .{ .data = .{ .ip = ip, .nav_index = nav_index, @@ -1105,7 +1105,7 @@ const FormatAirData = struct { fn formatAir(data: FormatAirData, w: *Writer) Writer.Error!void { data.self.air.writeInst(w, data.inst, data.self.pt, data.self.liveness); } -fn fmtAir(self: *CodeGen, inst: Air.Inst.Index) std.fmt.Formatter(FormatAirData, formatAir) { +fn fmtAir(self: *CodeGen, inst: Air.Inst.Index) std.fmt.Alt(FormatAirData, formatAir) { return .{ .data = .{ .self = self, .inst = inst } }; } @@ -1197,7 +1197,7 @@ fn formatWipMir(data: FormatWipMirData, w: *Writer) Writer.Error!void { } } } -fn fmtWipMir(self: *CodeGen, inst: Mir.Inst.Index) std.fmt.Formatter(FormatWipMirData, formatWipMir) { +fn fmtWipMir(self: *CodeGen, inst: Mir.Inst.Index) std.fmt.Alt(FormatWipMirData, formatWipMir) { return .{ .data = .{ .self = self, .inst = inst } }; } @@ -1208,7 +1208,7 @@ fn formatTracking(data: FormatTrackingData, w: *Writer) Writer.Error!void { var it = data.self.inst_tracking.iterator(); while (it.next()) |entry| try w.print("\n{f} = {f}", .{ entry.key_ptr.*, entry.value_ptr.* }); } -fn fmtTracking(self: *CodeGen) std.fmt.Formatter(FormatTrackingData, formatTracking) { +fn fmtTracking(self: *CodeGen) std.fmt.Alt(FormatTrackingData, formatTracking) { return .{ .data = .{ .self = self } }; } diff --git a/src/arch/x86_64/encoder.zig b/src/arch/x86_64/encoder.zig index 55ec7d49b6..03ff7134f6 100644 --- a/src/arch/x86_64/encoder.zig +++ b/src/arch/x86_64/encoder.zig @@ -301,7 +301,7 @@ pub const Instruction = struct { } }; - pub fn fmt(op: Operand, enc_op: Encoding.Op) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(op: Operand, enc_op: Encoding.Op) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .op = op, .enc_op = enc_op } }; } }; diff --git a/src/codegen/c.zig b/src/codegen/c.zig index b2ecac5d10..4468fa600f 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -371,11 +371,11 @@ fn formatIdentOptions(ident: []const u8, w: *Writer, solo: bool) Writer.Error!vo } } -pub fn fmtIdentSolo(ident: []const u8) std.fmt.Formatter([]const u8, formatIdentSolo) { +pub fn fmtIdentSolo(ident: []const u8) std.fmt.Alt([]const u8, formatIdentSolo) { return .{ .data = ident }; } -pub fn fmtIdentUnsolo(ident: []const u8) std.fmt.Formatter([]const u8, formatIdentUnsolo) { +pub fn fmtIdentUnsolo(ident: []const u8) std.fmt.Alt([]const u8, formatIdentUnsolo) { return .{ .data = ident }; } @@ -394,7 +394,7 @@ pub fn fmtCTypePoolString( ctype_pool_string: CType.Pool.String, ctype_pool: *const CType.Pool, solo: bool, -) std.fmt.Formatter(CTypePoolStringFormatData, formatCTypePoolString) { +) std.fmt.Alt(CTypePoolStringFormatData, formatCTypePoolString) { return .{ .data = .{ .ctype_pool_string = ctype_pool_string, .ctype_pool = ctype_pool, @@ -610,11 +610,11 @@ pub const Function = struct { return f.object.dg.renderIntCast(w, dest_ty, .{ .c_value = .{ .f = f, .value = src, .v = v } }, src_ty, location); } - fn fmtIntLiteralDec(f: *Function, val: Value) !std.fmt.Formatter(FormatIntLiteralContext, formatIntLiteral) { + fn fmtIntLiteralDec(f: *Function, val: Value) !std.fmt.Alt(FormatIntLiteralContext, formatIntLiteral) { return f.object.dg.fmtIntLiteralDec(val, .Other); } - fn fmtIntLiteralHex(f: *Function, val: Value) !std.fmt.Formatter(FormatIntLiteralContext, formatIntLiteral) { + fn fmtIntLiteralHex(f: *Function, val: Value) !std.fmt.Alt(FormatIntLiteralContext, formatIntLiteral) { return f.object.dg.fmtIntLiteralHex(val, .Other); } @@ -1919,7 +1919,7 @@ pub const DeclGen = struct { kind: CType.Kind, name: union(enum) { nav: InternPool.Nav.Index, - fmt_ctype_pool_string: std.fmt.Formatter(CTypePoolStringFormatData, formatCTypePoolString), + fmt_ctype_pool_string: std.fmt.Alt(CTypePoolStringFormatData, formatCTypePoolString), @"export": struct { main_name: InternPool.NullTerminatedString, extern_name: InternPool.NullTerminatedString, @@ -2439,7 +2439,7 @@ pub const DeclGen = struct { loc: ValueRenderLocation, base: u8, case: std.fmt.Case, - ) !std.fmt.Formatter(FormatIntLiteralContext, formatIntLiteral) { + ) !std.fmt.Alt(FormatIntLiteralContext, formatIntLiteral) { const zcu = dg.pt.zcu; const kind = loc.toCTypeKind(); const ty = val.typeOf(zcu); @@ -2461,7 +2461,7 @@ pub const DeclGen = struct { dg: *DeclGen, val: Value, loc: ValueRenderLocation, - ) !std.fmt.Formatter(FormatIntLiteralContext, formatIntLiteral) { + ) !std.fmt.Alt(FormatIntLiteralContext, formatIntLiteral) { return fmtIntLiteral(dg, val, loc, 10, .lower); } @@ -2469,7 +2469,7 @@ pub const DeclGen = struct { dg: *DeclGen, val: Value, loc: ValueRenderLocation, - ) !std.fmt.Formatter(FormatIntLiteralContext, formatIntLiteral) { + ) !std.fmt.Alt(FormatIntLiteralContext, formatIntLiteral) { return fmtIntLiteral(dg, val, loc, 16, .lower); } }; @@ -8295,7 +8295,7 @@ fn formatStringLiteral(data: FormatStringContext, w: *Writer) Writer.Error!void try literal.end(); } -fn fmtStringLiteral(str: []const u8, sentinel: ?u8) std.fmt.Formatter(FormatStringContext, formatStringLiteral) { +fn fmtStringLiteral(str: []const u8, sentinel: ?u8) std.fmt.Alt(FormatStringContext, formatStringLiteral) { return .{ .data = .{ .str = str, .sentinel = sentinel } }; } diff --git a/src/codegen/c/Type.zig b/src/codegen/c/Type.zig index d270e1dc9c..fa4db36a0c 100644 --- a/src/codegen/c/Type.zig +++ b/src/codegen/c/Type.zig @@ -989,7 +989,7 @@ pub const Pool = struct { else try writer.print("f{d}", .{@intFromEnum(data.string.index)}); } - pub fn fmt(str: String, pool: *const Pool) std.fmt.Formatter(FormatData, format) { + pub fn fmt(str: String, pool: *const Pool) std.fmt.Alt(FormatData, format) { return .{ .data = .{ .string = str, .pool = pool } }; } diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 4a3e201683..be9c4ff389 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -3053,7 +3053,7 @@ const ImportTable = struct { } }; - fn fmtDebug(itab: ImportTable, ctx: Context) fmt.Formatter(Format, Format.default) { + fn fmtDebug(itab: ImportTable, ctx: Context) fmt.Alt(Format, Format.default) { return .{ .data = .{ .itab = itab, .ctx = ctx } }; } diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 3a7d9d7c94..1c3d7c4267 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -3862,7 +3862,7 @@ const FormatShdr = struct { shdr: elf.Elf64_Shdr, }; -fn fmtShdr(self: *Elf, shdr: elf.Elf64_Shdr) std.fmt.Formatter(FormatShdr, formatShdr) { +fn fmtShdr(self: *Elf, shdr: elf.Elf64_Shdr) std.fmt.Alt(FormatShdr, formatShdr) { return .{ .data = .{ .shdr = shdr, .elf_file = self, @@ -3879,7 +3879,7 @@ fn formatShdr(ctx: FormatShdr, writer: *std.Io.Writer) std.Io.Writer.Error!void }); } -pub fn fmtShdrFlags(sh_flags: u64) std.fmt.Formatter(u64, formatShdrFlags) { +pub fn fmtShdrFlags(sh_flags: u64) std.fmt.Alt(u64, formatShdrFlags) { return .{ .data = sh_flags }; } @@ -3933,7 +3933,7 @@ const FormatPhdr = struct { phdr: elf.Elf64_Phdr, }; -fn fmtPhdr(self: *Elf, phdr: elf.Elf64_Phdr) std.fmt.Formatter(FormatPhdr, formatPhdr) { +fn fmtPhdr(self: *Elf, phdr: elf.Elf64_Phdr) std.fmt.Alt(FormatPhdr, formatPhdr) { return .{ .data = .{ .phdr = phdr, .elf_file = self, @@ -3967,7 +3967,7 @@ fn formatPhdr(ctx: FormatPhdr, writer: *std.Io.Writer) std.Io.Writer.Error!void }); } -pub fn dumpState(self: *Elf) std.fmt.Formatter(*Elf, fmtDumpState) { +pub fn dumpState(self: *Elf) std.fmt.Alt(*Elf, fmtDumpState) { return .{ .data = self }; } diff --git a/src/link/Elf/Archive.zig b/src/link/Elf/Archive.zig index 775a63cd74..0157b18fb4 100644 --- a/src/link/Elf/Archive.zig +++ b/src/link/Elf/Archive.zig @@ -215,7 +215,7 @@ pub const ArSymtab = struct { } }; - pub fn fmt(ar: ArSymtab, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(ar: ArSymtab, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .ar = ar, .elf_file = elf_file, diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig index 6bfaddea97..f59d2f4a24 100644 --- a/src/link/Elf/Atom.zig +++ b/src/link/Elf/Atom.zig @@ -894,7 +894,7 @@ pub fn setExtra(atom: Atom, extras: Extra, elf_file: *Elf) void { atom.file(elf_file).?.setAtomExtra(atom.extra_index, extras); } -pub fn fmt(atom: Atom, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { +pub fn fmt(atom: Atom, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .atom = atom, .elf_file = elf_file, diff --git a/src/link/Elf/AtomList.zig b/src/link/Elf/AtomList.zig index 4cb5b3f6f5..4eb1cbdbbd 100644 --- a/src/link/Elf/AtomList.zig +++ b/src/link/Elf/AtomList.zig @@ -187,7 +187,7 @@ const Format = struct { } }; -pub fn fmt(atom_list: AtomList, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { +pub fn fmt(atom_list: AtomList, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .atom_list = atom_list, .elf_file = elf_file } }; } diff --git a/src/link/Elf/LinkerDefined.zig b/src/link/Elf/LinkerDefined.zig index c1b3e257a4..b74406c368 100644 --- a/src/link/Elf/LinkerDefined.zig +++ b/src/link/Elf/LinkerDefined.zig @@ -437,7 +437,7 @@ pub fn setSymbolExtra(self: *LinkerDefined, index: u32, extra: Symbol.Extra) voi } } -pub fn fmtSymtab(self: *LinkerDefined, elf_file: *Elf) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *LinkerDefined, elf_file: *Elf) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .self = self, .elf_file = elf_file, diff --git a/src/link/Elf/Merge.zig b/src/link/Elf/Merge.zig index 95023055d9..340a2e7f67 100644 --- a/src/link/Elf/Merge.zig +++ b/src/link/Elf/Merge.zig @@ -157,7 +157,7 @@ pub const Section = struct { } }; - pub fn fmt(msec: Section, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(msec: Section, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .msec = msec, .elf_file = elf_file, @@ -211,7 +211,7 @@ pub const Subsection = struct { return msec.bytes.items[msub.string_index..][0..msub.size]; } - pub fn fmt(msub: Subsection, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(msub: Subsection, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .msub = msub, .elf_file = elf_file, diff --git a/src/link/Elf/Object.zig b/src/link/Elf/Object.zig index 52ae848345..eddb5c90dd 100644 --- a/src/link/Elf/Object.zig +++ b/src/link/Elf/Object.zig @@ -1431,7 +1431,7 @@ pub fn group(self: *Object, index: Elf.Group.Index) *Elf.Group { return &self.groups.items[index]; } -pub fn fmtSymtab(self: *Object, elf_file: *Elf) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *Object, elf_file: *Elf) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .object = self, .elf_file = elf_file, @@ -1504,35 +1504,35 @@ const Format = struct { } }; -pub fn fmtAtoms(self: *Object, elf_file: *Elf) std.fmt.Formatter(Format, Format.atoms) { +pub fn fmtAtoms(self: *Object, elf_file: *Elf) std.fmt.Alt(Format, Format.atoms) { return .{ .data = .{ .object = self, .elf_file = elf_file, } }; } -pub fn fmtCies(self: *Object, elf_file: *Elf) std.fmt.Formatter(Format, Format.cies) { +pub fn fmtCies(self: *Object, elf_file: *Elf) std.fmt.Alt(Format, Format.cies) { return .{ .data = .{ .object = self, .elf_file = elf_file, } }; } -pub fn fmtFdes(self: *Object, elf_file: *Elf) std.fmt.Formatter(Format, Format.fdes) { +pub fn fmtFdes(self: *Object, elf_file: *Elf) std.fmt.Alt(Format, Format.fdes) { return .{ .data = .{ .object = self, .elf_file = elf_file, } }; } -pub fn fmtGroups(self: *Object, elf_file: *Elf) std.fmt.Formatter(Format, Format.groups) { +pub fn fmtGroups(self: *Object, elf_file: *Elf) std.fmt.Alt(Format, Format.groups) { return .{ .data = .{ .object = self, .elf_file = elf_file, } }; } -pub fn fmtPath(self: Object) std.fmt.Formatter(Object, formatPath) { +pub fn fmtPath(self: Object) std.fmt.Alt(Object, formatPath) { return .{ .data = self }; } diff --git a/src/link/Elf/SharedObject.zig b/src/link/Elf/SharedObject.zig index 5be14b8a90..9ce8c53b2c 100644 --- a/src/link/Elf/SharedObject.zig +++ b/src/link/Elf/SharedObject.zig @@ -509,7 +509,7 @@ pub fn setSymbolExtra(self: *SharedObject, index: u32, extra: Symbol.Extra) void } } -pub fn fmtSymtab(self: SharedObject, elf_file: *Elf) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: SharedObject, elf_file: *Elf) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .shared = self, .elf_file = elf_file, diff --git a/src/link/Elf/Symbol.zig b/src/link/Elf/Symbol.zig index 3f99221842..e3974d0eac 100644 --- a/src/link/Elf/Symbol.zig +++ b/src/link/Elf/Symbol.zig @@ -368,14 +368,14 @@ const Format = struct { } }; -pub fn fmtName(symbol: Symbol, elf_file: *Elf) std.fmt.Formatter(Format, Format.name) { +pub fn fmtName(symbol: Symbol, elf_file: *Elf) std.fmt.Alt(Format, Format.name) { return .{ .data = .{ .symbol = symbol, .elf_file = elf_file, } }; } -pub fn fmt(symbol: Symbol, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { +pub fn fmt(symbol: Symbol, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .symbol = symbol, .elf_file = elf_file, diff --git a/src/link/Elf/Thunk.zig b/src/link/Elf/Thunk.zig index 8012c53a54..1700bb8276 100644 --- a/src/link/Elf/Thunk.zig +++ b/src/link/Elf/Thunk.zig @@ -65,7 +65,7 @@ fn trampolineSize(cpu_arch: std.Target.Cpu.Arch) usize { }; } -pub fn fmt(thunk: Thunk, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { +pub fn fmt(thunk: Thunk, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .thunk = thunk, .elf_file = elf_file, diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig index 82b2b91481..93a78ea012 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -2225,14 +2225,14 @@ const Format = struct { } }; -pub fn fmtSymtab(self: *ZigObject, elf_file: *Elf) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *ZigObject, elf_file: *Elf) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .self = self, .elf_file = elf_file, } }; } -pub fn fmtAtoms(self: *ZigObject, elf_file: *Elf) std.fmt.Formatter(Format, Format.atoms) { +pub fn fmtAtoms(self: *ZigObject, elf_file: *Elf) std.fmt.Alt(Format, Format.atoms) { return .{ .data = .{ .self = self, .elf_file = elf_file, diff --git a/src/link/Elf/eh_frame.zig b/src/link/Elf/eh_frame.zig index a0f07df79b..9276692f13 100644 --- a/src/link/Elf/eh_frame.zig +++ b/src/link/Elf/eh_frame.zig @@ -47,7 +47,7 @@ pub const Fde = struct { return object.relocs.items[fde.rel_index..][0..fde.rel_num]; } - pub fn fmt(fde: Fde, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(fde: Fde, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .fde = fde, .elf_file = elf_file, @@ -130,7 +130,7 @@ pub const Cie = struct { return true; } - pub fn fmt(cie: Cie, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(cie: Cie, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .cie = cie, .elf_file = elf_file, diff --git a/src/link/Elf/file.zig b/src/link/Elf/file.zig index 25c1b1192b..50f5159d18 100644 --- a/src/link/Elf/file.zig +++ b/src/link/Elf/file.zig @@ -10,7 +10,7 @@ pub const File = union(enum) { }; } - pub fn fmtPath(file: File) std.fmt.Formatter(File, formatPath) { + pub fn fmtPath(file: File) std.fmt.Alt(File, formatPath) { return .{ .data = file }; } diff --git a/src/link/Elf/relocation.zig b/src/link/Elf/relocation.zig index cffaffb954..021bfee209 100644 --- a/src/link/Elf/relocation.zig +++ b/src/link/Elf/relocation.zig @@ -153,7 +153,7 @@ const FormatRelocTypeCtx = struct { cpu_arch: std.Target.Cpu.Arch, }; -pub fn fmtRelocType(r_type: u32, cpu_arch: std.Target.Cpu.Arch) std.fmt.Formatter(FormatRelocTypeCtx, formatRelocType) { +pub fn fmtRelocType(r_type: u32, cpu_arch: std.Target.Cpu.Arch) std.fmt.Alt(FormatRelocTypeCtx, formatRelocType) { return .{ .data = .{ .r_type = r_type, .cpu_arch = cpu_arch, diff --git a/src/link/Elf/synthetic_sections.zig b/src/link/Elf/synthetic_sections.zig index 33522c0555..2ff7302410 100644 --- a/src/link/Elf/synthetic_sections.zig +++ b/src/link/Elf/synthetic_sections.zig @@ -622,7 +622,7 @@ pub const GotSection = struct { } }; - pub fn fmt(got: GotSection, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(got: GotSection, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .got = got, .elf_file = elf_file } }; } }; @@ -758,7 +758,7 @@ pub const PltSection = struct { } }; - pub fn fmt(plt: PltSection, elf_file: *Elf) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(plt: PltSection, elf_file: *Elf) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .plt = plt, .elf_file = elf_file } }; } diff --git a/src/link/MachO.zig b/src/link/MachO.zig index d8c4a20767..9205d51981 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -3906,7 +3906,7 @@ pub fn ptraceDetach(self: *MachO, pid: std.posix.pid_t) !void { self.hot_state.mach_task = null; } -pub fn dumpState(self: *MachO) std.fmt.Formatter(*MachO, fmtDumpState) { +pub fn dumpState(self: *MachO) std.fmt.Alt(*MachO, fmtDumpState) { return .{ .data = self }; } @@ -3964,7 +3964,7 @@ fn fmtDumpState(self: *MachO, w: *Writer) Writer.Error!void { try w.print("segments\n{f}\n", .{self.fmtSegments()}); } -fn fmtSections(self: *MachO) std.fmt.Formatter(*MachO, formatSections) { +fn fmtSections(self: *MachO) std.fmt.Alt(*MachO, formatSections) { return .{ .data = self }; } @@ -3981,7 +3981,7 @@ fn formatSections(self: *MachO, w: *Writer) Writer.Error!void { } } -fn fmtSegments(self: *MachO) std.fmt.Formatter(*MachO, formatSegments) { +fn fmtSegments(self: *MachO) std.fmt.Alt(*MachO, formatSegments) { return .{ .data = self }; } @@ -3994,7 +3994,7 @@ fn formatSegments(self: *MachO, w: *Writer) Writer.Error!void { } } -pub fn fmtSectType(tt: u8) std.fmt.Formatter(u8, formatSectType) { +pub fn fmtSectType(tt: u8) std.fmt.Alt(u8, formatSectType) { return .{ .data = tt }; } @@ -4257,7 +4257,7 @@ pub const Platform = struct { return false; } - pub fn fmtTarget(plat: Platform, cpu_arch: std.Target.Cpu.Arch) std.fmt.Formatter(Format, Format.target) { + pub fn fmtTarget(plat: Platform, cpu_arch: std.Target.Cpu.Arch) std.fmt.Alt(Format, Format.target) { return .{ .data = .{ .platform = plat, .cpu_arch = cpu_arch } }; } diff --git a/src/link/MachO/Archive.zig b/src/link/MachO/Archive.zig index 1c7e285eb7..007e630bfb 100644 --- a/src/link/MachO/Archive.zig +++ b/src/link/MachO/Archive.zig @@ -225,7 +225,7 @@ pub const ArSymtab = struct { } }; - pub fn fmt(ar: ArSymtab, macho_file: *MachO) std.fmt.Formatter(PrintFormat, PrintFormat.default) { + pub fn fmt(ar: ArSymtab, macho_file: *MachO) std.fmt.Alt(PrintFormat, PrintFormat.default) { return .{ .data = .{ .ar = ar, .macho_file = macho_file } }; } diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig index c5d29c7ff5..278d28d270 100644 --- a/src/link/MachO/Atom.zig +++ b/src/link/MachO/Atom.zig @@ -1073,7 +1073,7 @@ pub fn writeRelocs(self: Atom, macho_file: *MachO, code: []u8, buffer: []macho.r assert(i == buffer.len); } -pub fn fmt(atom: Atom, macho_file: *MachO) std.fmt.Formatter(Format, Format.print) { +pub fn fmt(atom: Atom, macho_file: *MachO) std.fmt.Alt(Format, Format.print) { return .{ .data = .{ .atom = atom, .macho_file = macho_file, diff --git a/src/link/MachO/Dylib.zig b/src/link/MachO/Dylib.zig index bf48addc1e..526ca2d086 100644 --- a/src/link/MachO/Dylib.zig +++ b/src/link/MachO/Dylib.zig @@ -667,7 +667,7 @@ pub fn setSymbolExtra(self: *Dylib, index: u32, extra: Symbol.Extra) void { } } -pub fn fmtSymtab(self: *Dylib, macho_file: *MachO) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *Dylib, macho_file: *MachO) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .dylib = self, .macho_file = macho_file, diff --git a/src/link/MachO/InternalObject.zig b/src/link/MachO/InternalObject.zig index f8623dbf28..00721c470b 100644 --- a/src/link/MachO/InternalObject.zig +++ b/src/link/MachO/InternalObject.zig @@ -864,14 +864,14 @@ const Format = struct { } }; -pub fn fmtAtoms(self: *InternalObject, macho_file: *MachO) std.fmt.Formatter(Format, Format.atoms) { +pub fn fmtAtoms(self: *InternalObject, macho_file: *MachO) std.fmt.Alt(Format, Format.atoms) { return .{ .data = .{ .self = self, .macho_file = macho_file, } }; } -pub fn fmtSymtab(self: *InternalObject, macho_file: *MachO) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *InternalObject, macho_file: *MachO) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .self = self, .macho_file = macho_file, diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig index 9dcaca76c8..6752c751b2 100644 --- a/src/link/MachO/Object.zig +++ b/src/link/MachO/Object.zig @@ -2578,42 +2578,42 @@ const Format = struct { } }; -pub fn fmtAtoms(self: *Object, macho_file: *MachO) std.fmt.Formatter(Format, Format.atoms) { +pub fn fmtAtoms(self: *Object, macho_file: *MachO) std.fmt.Alt(Format, Format.atoms) { return .{ .data = .{ .object = self, .macho_file = macho_file, } }; } -pub fn fmtCies(self: *Object, macho_file: *MachO) std.fmt.Formatter(Format, Format.cies) { +pub fn fmtCies(self: *Object, macho_file: *MachO) std.fmt.Alt(Format, Format.cies) { return .{ .data = .{ .object = self, .macho_file = macho_file, } }; } -pub fn fmtFdes(self: *Object, macho_file: *MachO) std.fmt.Formatter(Format, Format.fdes) { +pub fn fmtFdes(self: *Object, macho_file: *MachO) std.fmt.Alt(Format, Format.fdes) { return .{ .data = .{ .object = self, .macho_file = macho_file, } }; } -pub fn fmtUnwindRecords(self: *Object, macho_file: *MachO) std.fmt.Formatter(Format, Format.unwindRecords) { +pub fn fmtUnwindRecords(self: *Object, macho_file: *MachO) std.fmt.Alt(Format, Format.unwindRecords) { return .{ .data = .{ .object = self, .macho_file = macho_file, } }; } -pub fn fmtSymtab(self: *Object, macho_file: *MachO) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *Object, macho_file: *MachO) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .object = self, .macho_file = macho_file, } }; } -pub fn fmtPath(self: Object) std.fmt.Formatter(Object, formatPath) { +pub fn fmtPath(self: Object) std.fmt.Alt(Object, formatPath) { return .{ .data = self }; } @@ -2694,7 +2694,7 @@ const StabFile = struct { } }; - pub fn fmt(stab: Stab, object: Object) std.fmt.Formatter(Stab.Format, Stab.Format.default) { + pub fn fmt(stab: Stab, object: Object) std.fmt.Alt(Stab.Format, Stab.Format.default) { return .{ .data = .{ .stab = stab, .object = object } }; } }; diff --git a/src/link/MachO/Relocation.zig b/src/link/MachO/Relocation.zig index 6ce8fa1bb2..20edce1bbe 100644 --- a/src/link/MachO/Relocation.zig +++ b/src/link/MachO/Relocation.zig @@ -70,7 +70,7 @@ pub fn lessThan(ctx: void, lhs: Relocation, rhs: Relocation) bool { return lhs.offset < rhs.offset; } -pub fn fmtPretty(rel: Relocation, cpu_arch: std.Target.Cpu.Arch) std.fmt.Formatter(Format, Format.pretty) { +pub fn fmtPretty(rel: Relocation, cpu_arch: std.Target.Cpu.Arch) std.fmt.Alt(Format, Format.pretty) { return .{ .data = .{ .relocation = rel, .arch = cpu_arch } }; } diff --git a/src/link/MachO/Symbol.zig b/src/link/MachO/Symbol.zig index ab7d128d9e..582768ad10 100644 --- a/src/link/MachO/Symbol.zig +++ b/src/link/MachO/Symbol.zig @@ -286,7 +286,7 @@ pub fn setOutputSym(symbol: Symbol, macho_file: *MachO, out: *macho.nlist_64) vo } } -pub fn fmt(symbol: Symbol, macho_file: *MachO) std.fmt.Formatter(Format, Format.default) { +pub fn fmt(symbol: Symbol, macho_file: *MachO) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .symbol = symbol, .macho_file = macho_file, diff --git a/src/link/MachO/Thunk.zig b/src/link/MachO/Thunk.zig index 44d2904540..4588a7f0e0 100644 --- a/src/link/MachO/Thunk.zig +++ b/src/link/MachO/Thunk.zig @@ -63,7 +63,7 @@ pub fn writeSymtab(thunk: Thunk, macho_file: *MachO, ctx: anytype) void { } } -pub fn fmt(thunk: Thunk, macho_file: *MachO) std.fmt.Formatter(Format, Format.default) { +pub fn fmt(thunk: Thunk, macho_file: *MachO) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .thunk = thunk, .macho_file = macho_file, diff --git a/src/link/MachO/UnwindInfo.zig b/src/link/MachO/UnwindInfo.zig index 9b7185743b..5dff5450f5 100644 --- a/src/link/MachO/UnwindInfo.zig +++ b/src/link/MachO/UnwindInfo.zig @@ -509,7 +509,7 @@ pub const Record = struct { return lsda.getAddress(macho_file) + rec.lsda_offset; } - pub fn fmt(rec: Record, macho_file: *MachO) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(rec: Record, macho_file: *MachO) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .rec = rec, .macho_file = macho_file, @@ -603,7 +603,7 @@ const Page = struct { } }; - fn fmt(page: Page, info: UnwindInfo) std.fmt.Formatter(Format, Format.default) { + fn fmt(page: Page, info: UnwindInfo) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .page = page, .info = info, diff --git a/src/link/MachO/ZigObject.zig b/src/link/MachO/ZigObject.zig index e8d5cce3e2..b1fc6528d5 100644 --- a/src/link/MachO/ZigObject.zig +++ b/src/link/MachO/ZigObject.zig @@ -1680,7 +1680,7 @@ pub fn asFile(self: *ZigObject) File { return .{ .zig_object = self }; } -pub fn fmtSymtab(self: *ZigObject, macho_file: *MachO) std.fmt.Formatter(Format, Format.symtab) { +pub fn fmtSymtab(self: *ZigObject, macho_file: *MachO) std.fmt.Alt(Format, Format.symtab) { return .{ .data = .{ .self = self, .macho_file = macho_file, @@ -1717,7 +1717,7 @@ const Format = struct { } }; -pub fn fmtAtoms(self: *ZigObject, macho_file: *MachO) std.fmt.Formatter(Format, Format.atoms) { +pub fn fmtAtoms(self: *ZigObject, macho_file: *MachO) std.fmt.Alt(Format, Format.atoms) { return .{ .data = .{ .self = self, .macho_file = macho_file, diff --git a/src/link/MachO/eh_frame.zig b/src/link/MachO/eh_frame.zig index bd13e50180..86edf97396 100644 --- a/src/link/MachO/eh_frame.zig +++ b/src/link/MachO/eh_frame.zig @@ -79,7 +79,7 @@ pub const Cie = struct { return true; } - pub fn fmt(cie: Cie, macho_file: *MachO) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(cie: Cie, macho_file: *MachO) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .cie = cie, .macho_file = macho_file, @@ -208,7 +208,7 @@ pub const Fde = struct { return fde.getObject(macho_file).getAtom(fde.lsda); } - pub fn fmt(fde: Fde, macho_file: *MachO) std.fmt.Formatter(Format, Format.default) { + pub fn fmt(fde: Fde, macho_file: *MachO) std.fmt.Alt(Format, Format.default) { return .{ .data = .{ .fde = fde, .macho_file = macho_file, diff --git a/src/link/MachO/file.zig b/src/link/MachO/file.zig index 2b0f8e644b..577e9374a6 100644 --- a/src/link/MachO/file.zig +++ b/src/link/MachO/file.zig @@ -10,7 +10,7 @@ pub const File = union(enum) { }; } - pub fn fmtPath(file: File) std.fmt.Formatter(File, formatPath) { + pub fn fmtPath(file: File) std.fmt.Alt(File, formatPath) { return .{ .data = file }; } diff --git a/src/link/MachO/synthetic.zig b/src/link/MachO/synthetic.zig index 6761a4a340..79fbd8d3d0 100644 --- a/src/link/MachO/synthetic.zig +++ b/src/link/MachO/synthetic.zig @@ -55,7 +55,7 @@ pub const GotSection = struct { } }; - pub fn fmt(got: GotSection, macho_file: *MachO) std.fmt.Formatter(Format, Format.print) { + pub fn fmt(got: GotSection, macho_file: *MachO) std.fmt.Alt(Format, Format.print) { return .{ .data = .{ .got = got, .macho_file = macho_file } }; } }; @@ -120,7 +120,7 @@ pub const StubsSection = struct { } } - pub fn fmt(stubs: StubsSection, macho_file: *MachO) std.fmt.Formatter(Format, Format.print) { + pub fn fmt(stubs: StubsSection, macho_file: *MachO) std.fmt.Alt(Format, Format.print) { return .{ .data = .{ .stubs = stubs, .macho_file = macho_file } }; } @@ -337,7 +337,7 @@ pub const TlvPtrSection = struct { } } - pub fn fmt(tlv: TlvPtrSection, macho_file: *MachO) std.fmt.Formatter(Format, Format.print) { + pub fn fmt(tlv: TlvPtrSection, macho_file: *MachO) std.fmt.Alt(Format, Format.print) { return .{ .data = .{ .tlv = tlv, .macho_file = macho_file } }; } @@ -452,7 +452,7 @@ pub const ObjcStubsSection = struct { } } - pub fn fmt(objc: ObjcStubsSection, macho_file: *MachO) std.fmt.Formatter(Format, Format.print) { + pub fn fmt(objc: ObjcStubsSection, macho_file: *MachO) std.fmt.Alt(Format, Format.print) { return .{ .data = .{ .objc = objc, .macho_file = macho_file } }; } |
