Skip to content

Commit

Permalink
std: use std.ArrayList(u8).OutStream instead of std.Buffer.OutStream
Browse files Browse the repository at this point in the history
  • Loading branch information
daurnimator committed Mar 12, 2020
1 parent 9ab700b commit fe69332
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
8 changes: 4 additions & 4 deletions doc/docgen.zig
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
var last_action = Action.Open;
var last_columns: ?u8 = null;

var toc_buf = try std.Buffer.initSize(allocator, 0);
var toc_buf = std.ArrayList(u8).init(allocator);
defer toc_buf.deinit();

var toc = toc_buf.outStream();
Expand Down Expand Up @@ -607,7 +607,7 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
}

fn urlize(allocator: *mem.Allocator, input: []const u8) ![]u8 {
var buf = try std.Buffer.initSize(allocator, 0);
var buf = std.ArrayList(u8).init(allocator);
defer buf.deinit();

const out = buf.outStream();
Expand All @@ -626,7 +626,7 @@ fn urlize(allocator: *mem.Allocator, input: []const u8) ![]u8 {
}

fn escapeHtml(allocator: *mem.Allocator, input: []const u8) ![]u8 {
var buf = try std.Buffer.initSize(allocator, 0);
var buf = std.ArrayList(u8).init(allocator);
defer buf.deinit();

const out = buf.outStream();
Expand Down Expand Up @@ -672,7 +672,7 @@ test "term color" {
}

fn termColor(allocator: *mem.Allocator, input: []const u8) ![]u8 {
var buf = try std.Buffer.initSize(allocator, 0);
var buf = std.ArrayList(u8).init(allocator);
defer buf.deinit();

var out = buf.outStream();
Expand Down
2 changes: 1 addition & 1 deletion lib/std/zig/parser_test.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2840,7 +2840,7 @@ fn testParse(source: []const u8, allocator: *mem.Allocator, anything_changed: *b
return error.ParseError;
}

var buffer = try std.Buffer.initSize(allocator, 0);
var buffer = std.ArrayList(u8).init(allocator);
errdefer buffer.deinit();

anything_changed.* = try std.zig.render(allocator, buffer.outStream(), tree);
Expand Down
10 changes: 4 additions & 6 deletions src-self-hosted/errmsg.zig
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,13 @@ pub const Msg = struct {
parse_error: *const ast.Error,
) !*Msg {
const loc_token = parse_error.loc();
var text_buf = try std.Buffer.initSize(comp.gpa(), 0);
var text_buf = std.ArrayList(u8).init(comp.gpa());
defer text_buf.deinit();

const realpath_copy = try mem.dupe(comp.gpa(), u8, tree_scope.root().realpath);
errdefer comp.gpa().free(realpath_copy);

var out_stream = &std.io.BufferOutStream.init(&text_buf).stream;
try parse_error.render(&tree_scope.tree.tokens, out_stream);
try parse_error.render(&tree_scope.tree.tokens, text_buf.outStream());

const msg = try comp.gpa().create(Msg);
msg.* = Msg{
Expand Down Expand Up @@ -198,14 +197,13 @@ pub const Msg = struct {
realpath: []const u8,
) !*Msg {
const loc_token = parse_error.loc();
var text_buf = try std.Buffer.initSize(allocator, 0);
var text_buf = std.ArrayList(u8).init(allocator);
defer text_buf.deinit();

const realpath_copy = try mem.dupe(allocator, u8, realpath);
errdefer allocator.free(realpath_copy);

var out_stream = &std.io.BufferOutStream.init(&text_buf).stream;
try parse_error.render(&tree.tokens, out_stream);
try parse_error.render(&tree.tokens, text_buf.outStream());

const msg = try allocator.create(Msg);
msg.* = Msg{
Expand Down
5 changes: 3 additions & 2 deletions src-self-hosted/stage2.zig
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,11 @@ fn printErrMsgToFile(
const start_loc = tree.tokenLocationPtr(0, first_token);
const end_loc = tree.tokenLocationPtr(first_token.end, last_token);

var text_buf = try std.Buffer.initSize(allocator, 0);
var text_buf = std.ArrayList(u8).init(allocator);
defer text_buf.deinit();
const out_stream = &text_buf.outStream();
try parse_error.render(&tree.tokens, out_stream);
const text = text_buf.toOwnedSlice();
const text = text_buf.span();

const stream = &file.outStream();
try stream.print("{}:{}:{}: error: {}\n", .{ path, start_loc.line + 1, start_loc.column + 1, text });
Expand Down
4 changes: 2 additions & 2 deletions src-self-hosted/type.zig
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,10 @@ pub const Type = struct {
};
errdefer comp.gpa().destroy(self);

var name_buf = try std.Buffer.initSize(comp.gpa(), 0);
var name_buf = std.ArrayList(u8).init(comp.gpa());
defer name_buf.deinit();

const name_stream = &std.io.BufferOutStream.init(&name_buf).stream;
const name_stream = name_buf.outStream();

switch (key.data) {
.Generic => |generic| {
Expand Down

0 comments on commit fe69332

Please sign in to comment.