Skip to content

Commit aff16e8

Browse files
committed
fixups from review
1 parent abd0d88 commit aff16e8

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/Compilation.zig

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ pub const AllErrors = struct {
514514
}
515515
ttyconf.setColor(stderr, .Reset);
516516
for (plain.notes) |note| {
517-
try note.renderToWriter(ttyconf, stderr, "error", .Red, indent + 4);
517+
try note.renderToWriter(ttyconf, stderr, "note", .Cyan, indent + 4);
518518
}
519519
},
520520
}
@@ -5025,7 +5025,7 @@ pub fn lockAndSetMiscFailure(
50255025
return setMiscFailure(comp, tag, format, args);
50265026
}
50275027

5028-
fn parseLddStderr(comp: *Compilation, comptime prefix: []const u8, stderr: []const u8) Allocator.Error!void {
5028+
fn parseLldStderr(comp: *Compilation, comptime prefix: []const u8, stderr: []const u8) Allocator.Error!void {
50295029
var context_lines = std.ArrayList([]const u8).init(comp.gpa);
50305030
defer context_lines.deinit();
50315031

@@ -5037,7 +5037,10 @@ fn parseLddStderr(comp: *Compilation, comptime prefix: []const u8, stderr: []con
50375037
err.context_lines = context_lines.toOwnedSlice();
50385038
}
50395039

5040-
const duped_msg = try comp.gpa.dupe(u8, line);
5040+
var split = std.mem.split(u8, line, "error: ");
5041+
_ = split.first();
5042+
5043+
const duped_msg = try std.fmt.allocPrint(comp.gpa, "{s}: {s}", .{ prefix, split.rest() });
50415044
errdefer comp.gpa.free(duped_msg);
50425045

50435046
current_err = try comp.lld_errors.addOne(comp.gpa);
@@ -5065,7 +5068,7 @@ pub fn lockAndParseLldStderr(comp: *Compilation, comptime prefix: []const u8, st
50655068
comp.mutex.lock();
50665069
defer comp.mutex.unlock();
50675070

5068-
comp.parseLddStderr(prefix, stderr) catch comp.setAllocFailure();
5071+
comp.parseLldStderr(prefix, stderr) catch comp.setAllocFailure();
50695072
}
50705073

50715074
pub fn dump_argv(argv: []const []const u8) void {

0 commit comments

Comments
 (0)