Skip to content

Commit bad836a

Browse files
committed
Compilation: revert some stuff
1 parent 93378e2 commit bad836a

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/Compilation.zig

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -998,13 +998,13 @@ pub const CObject = struct {
998998

999999
const file = fs.cwd().openFile(file_name, .{}) catch break :source_line 0;
10001000
defer file.close();
1001-
var buffer: [1024]u8 = undefined;
1002-
var file_reader = file.reader(&buffer);
1003-
file_reader.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
1004-
var aw: Writer.Allocating = .init(eb.gpa);
1005-
defer aw.deinit();
1006-
_ = file_reader.interface.streamDelimiterEnding(&aw.writer, '\n') catch break :source_line 0;
1007-
break :source_line try eb.addString(aw.getWritten());
1001+
file.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
1002+
1003+
var line = std.ArrayList(u8).init(eb.gpa);
1004+
defer line.deinit();
1005+
file.deprecatedReader().readUntilDelimiterArrayList(&line, '\n', 1 << 10) catch break :source_line 0;
1006+
1007+
break :source_line try eb.addString(line.items);
10081008
};
10091009

10101010
return .{
@@ -5850,9 +5850,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
58505850

58515851
try child.spawn();
58525852

5853-
var small_buffer: [1]u8 = undefined;
5854-
var stderr_reader = child.stderr.?.reader(&small_buffer);
5855-
const stderr = try stderr_reader.interface.allocRemaining(arena, .unlimited);
5853+
const stderr = try child.stderr.?.deprecatedReader().readAllAlloc(arena, std.math.maxInt(usize));
58565854

58575855
const term = child.wait() catch |err| {
58585856
return comp.failCObj(c_object, "failed to spawn zig clang {s}: {s}", .{ argv.items[0], @errorName(err) });

0 commit comments

Comments
 (0)