@@ -589,7 +589,7 @@ fn classifyInputFile(self: *MachO, obj: LinkObject) !void {
589589 const tracy = trace (@src ());
590590 defer tracy .end ();
591591
592- log .debug ("parsing positional {}" , .{obj });
592+ log .debug ("parsing positional {f }" , .{obj });
593593
594594 const file = try std .fs .cwd ().openFile (obj .path , .{});
595595 const fh = try self .addFileHandle (file );
@@ -810,10 +810,9 @@ fn parseDylibWorker(self: *MachO, index: File.Index) void {
810810 dylib .parse (self ) catch | err | {
811811 switch (err ) {
812812 error .ParseFailed = > {}, // reported already
813- else = > | e | self .fatal ("{s}: unexpected error occurred while parsing input file: {s}: {f} " , .{
813+ else = > | e | self .fatal ("{s}: unexpected error occurred while parsing input file: {s}" , .{
814814 dylib .path ,
815815 @errorName (e ),
816- @errorReturnTrace (),
817816 }),
818817 }
819818 _ = self .has_errors .swap (true , .seq_cst );
@@ -869,7 +868,7 @@ fn dedupDylibs(self: *MachO, resolved_objects: []const LinkObject) !void {
869868 if (! gop .found_existing ) continue ;
870869
871870 if (cmd_object .tag == .lib ) {
872- self .warn ("ignoring duplicate libraries: {}" , .{cmd_object });
871+ self .warn ("ignoring duplicate libraries: {f }" , .{cmd_object });
873872 }
874873
875874 marker .* = true ;
@@ -1296,12 +1295,12 @@ fn reportDuplicates(self: *MachO) error{ HasDuplicates, OutOfMemory }!void {
12961295 const err = try self .addErrorWithNotes (nnotes + 1 );
12971296 defer err .unlock ();
12981297 try err .addMsg ("duplicate symbol definition: {s}" , .{sym .getName (self )});
1299- try err .addNote ("defined by {}" , .{sym .getFile (self ).fmtPath ()});
1298+ try err .addNote ("defined by {f }" , .{sym .getFile (self ).fmtPath ()});
13001299
13011300 var inote : usize = 0 ;
13021301 while (inote < @min (notes .items .len , max_notes )) : (inote += 1 ) {
13031302 const file = self .getFile (notes .items [inote ]);
1304- try err .addNote ("defined by {}" , .{file .fmtPath ()});
1303+ try err .addNote ("defined by {f }" , .{file .fmtPath ()});
13051304 }
13061305
13071306 if (notes .items .len > max_notes ) {
@@ -1441,7 +1440,7 @@ fn reportUndefs(self: *MachO) !void {
14411440 const ref = refs .items [inote ].unwrap ().? ;
14421441 const file = self .getFile (ref .file );
14431442 const atom = file .getAtom (ref .atom );
1444- try err .addNote ("referenced by {}:{s}" , .{ file .fmtPath (), atom .getName (self ) });
1443+ try err .addNote ("referenced by {f }:{s}" , .{ file .fmtPath (), atom .getName (self ) });
14451444 }
14461445
14471446 if (refs .items .len > max_notes ) {
@@ -3082,7 +3081,7 @@ fn formatSegments(self: *MachO, writer: *Writer) Writer.Error!void {
30823081 }
30833082}
30843083
3085- pub fn fmtSectType (tt : u8 ) std.fmt.Formatter (* MachO , formatSectType ) {
3084+ pub fn fmtSectType (tt : u8 ) std.fmt.Formatter (u8 , formatSectType ) {
30863085 return .{ .data = tt };
30873086}
30883087
0 commit comments