aboutsummaryrefslogtreecommitdiff
path: root/src-self-hosted/link.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-04-01 13:44:19 -0400
committerAndrew Kelley <andrew@ziglang.org>2020-04-01 13:44:19 -0400
commitc2e8788259efd33995e151ace355cb5896cc8a85 (patch)
tree7962a47dd9df3976a7aa8c8c5ad754d27dd55ba4 /src-self-hosted/link.zig
parente8a1e2a1d8f2903d5951339f7d3e0dbdfc85704c (diff)
parent2e806682f451efd26bef0486ddd980ab60de0fa1 (diff)
downloadzig-c2e8788259efd33995e151ace355cb5896cc8a85.tar.gz
zig-c2e8788259efd33995e151ace355cb5896cc8a85.zip
Merge branch 'daurnimator-less-buffer'
closes #4665
Diffstat (limited to 'src-self-hosted/link.zig')
-rw-r--r--src-self-hosted/link.zig8
1 files changed, 4 insertions, 4 deletions
diff --git a/src-self-hosted/link.zig b/src-self-hosted/link.zig
index ee2ef53d22..013a6248cc 100644
--- a/src-self-hosted/link.zig
+++ b/src-self-hosted/link.zig
@@ -15,10 +15,10 @@ const Context = struct {
link_in_crt: bool,
link_err: error{OutOfMemory}!void,
- link_msg: std.Buffer,
+ link_msg: std.ArrayListSentineled(u8, 0),
libc: *LibCInstallation,
- out_file_path: std.Buffer,
+ out_file_path: std.ArrayListSentineled(u8, 0),
};
pub fn link(comp: *Compilation) !void {
@@ -34,9 +34,9 @@ pub fn link(comp: *Compilation) !void {
};
defer ctx.arena.deinit();
ctx.args = std.ArrayList([*:0]const u8).init(&ctx.arena.allocator);
- ctx.link_msg = std.Buffer.initNull(&ctx.arena.allocator);
+ ctx.link_msg = std.ArrayListSentineled(u8, 0).initNull(&ctx.arena.allocator);
- ctx.out_file_path = try std.Buffer.init(&ctx.arena.allocator, comp.name.span());
+ ctx.out_file_path = try std.ArrayListSentineled(u8, 0).init(&ctx.arena.allocator, comp.name.span());
switch (comp.kind) {
.Exe => {
try ctx.out_file_path.append(comp.target.exeFileExt());