aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
authorJay Petacat <jay@jayschwa.net>2021-01-05 20:57:18 -0500
committerAndrew Kelley <andrew@ziglang.org>2021-01-07 23:48:58 -0800
commita9b505fa7774e2e8451bedfa7bea27d7227572e7 (patch)
tree408a88da61e15d5ace79ecefebfe868c09f80d35 /src/main.zig
parent8e9a1ac364360b160438af0b96132d5aacf39a71 (diff)
downloadzig-a9b505fa7774e2e8451bedfa7bea27d7227572e7.tar.gz
zig-a9b505fa7774e2e8451bedfa7bea27d7227572e7.zip
Reduce use of deprecated IO types
Related: #4917
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/main.zig b/src/main.zig
index cd89f269d0..7829901acc 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -196,7 +196,7 @@ pub fn mainArgs(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !v
return cmdInit(gpa, arena, cmd_args, .Lib);
} else if (mem.eql(u8, cmd, "targets")) {
const info = try detectNativeTargetInfo(arena, .{});
- const stdout = io.getStdOut().outStream();
+ const stdout = io.getStdOut().writer();
return @import("print_targets.zig").cmdTargets(arena, cmd_args, stdout, info.target);
} else if (mem.eql(u8, cmd, "version")) {
try std.io.getStdOut().writeAll(build_options.version ++ "\n");
@@ -1944,8 +1944,8 @@ fn buildOutputType(
}
}
- const stdin = std.io.getStdIn().inStream();
- const stderr = std.io.getStdErr().outStream();
+ const stdin = std.io.getStdIn().reader();
+ const stderr = std.io.getStdErr().writer();
var repl_buf: [1024]u8 = undefined;
while (watch) {
@@ -2114,9 +2114,9 @@ fn cmdTranslateC(comp: *Compilation, arena: *Allocator, enable_cache: bool) !voi
var zig_file = try o_dir.createFile(translated_zig_basename, .{});
defer zig_file.close();
- var bos = io.bufferedOutStream(zig_file.writer());
- _ = try std.zig.render(comp.gpa, bos.writer(), tree);
- try bos.flush();
+ var bw = io.bufferedWriter(zig_file.writer());
+ _ = try std.zig.render(comp.gpa, bw.writer(), tree);
+ try bw.flush();
man.writeManifest() catch |err| warn("failed to write cache manifest: {s}", .{@errorName(err)});
@@ -2187,9 +2187,9 @@ pub fn cmdLibC(gpa: *Allocator, args: []const []const u8) !void {
};
defer libc.deinit(gpa);
- var bos = io.bufferedOutStream(io.getStdOut().writer());
- try libc.render(bos.writer());
- try bos.flush();
+ var bw = io.bufferedWriter(io.getStdOut().writer());
+ try libc.render(bw.writer());
+ try bw.flush();
}
}
@@ -2570,7 +2570,7 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
const arg = args[i];
if (mem.startsWith(u8, arg, "-")) {
if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
- const stdout = io.getStdOut().outStream();
+ const stdout = io.getStdOut().writer();
try stdout.writeAll(usage_fmt);
return cleanExit();
} else if (mem.eql(u8, arg, "--color")) {
@@ -2600,7 +2600,7 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
fatal("cannot use --stdin with positional arguments", .{});
}
- const stdin = io.getStdIn().inStream();
+ const stdin = io.getStdIn().reader();
const source_code = try stdin.readAllAlloc(gpa, max_src_size);
defer gpa.free(source_code);
@@ -2617,14 +2617,14 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
process.exit(1);
}
if (check_flag) {
- const anything_changed = try std.zig.render(gpa, io.null_out_stream, tree);
+ const anything_changed = try std.zig.render(gpa, io.null_writer, tree);
const code = if (anything_changed) @as(u8, 1) else @as(u8, 0);
process.exit(code);
}
- var bos = io.bufferedOutStream(io.getStdOut().writer());
- _ = try std.zig.render(gpa, bos.writer(), tree);
- try bos.flush();
+ var bw = io.bufferedWriter(io.getStdOut().writer());
+ _ = try std.zig.render(gpa, bw.writer(), tree);
+ try bw.flush();
return;
}
@@ -2774,7 +2774,7 @@ fn fmtPathFile(
}
if (check_mode) {
- const anything_changed = try std.zig.render(fmt.gpa, io.null_out_stream, tree);
+ const anything_changed = try std.zig.render(fmt.gpa, io.null_writer, tree);
if (anything_changed) {
const stdout = io.getStdOut().writer();
try stdout.print("{s}\n", .{file_path});
@@ -2823,11 +2823,11 @@ fn printErrMsgToFile(
var text_buf = std.ArrayList(u8).init(gpa);
defer text_buf.deinit();
- const out_stream = text_buf.outStream();
- try parse_error.render(tree.token_ids, out_stream);
+ const writer = text_buf.writer();
+ try parse_error.render(tree.token_ids, writer);
const text = text_buf.items;
- const stream = file.outStream();
+ const stream = file.writer();
try stream.print("{s}:{d}:{d}: error: {s}\n", .{ path, start_loc.line + 1, start_loc.column + 1, text });
if (!color_on) return;