diff options
| author | Dmitry Matveyev <greenfork.lists@yandex.com> | 2021-06-14 22:13:32 +0600 |
|---|---|---|
| committer | Dmitry Matveyev <greenfork.lists@yandex.com> | 2021-06-14 22:13:32 +0600 |
| commit | 3150458f2f4aa06c6cd99cb6ec06791f1ca05505 (patch) | |
| tree | 1599c610564cfeb5ed3234facf868d73b631f1ee /src/main.zig | |
| parent | 382f87abac469db7cbc4968ca03e02cc1af5f6ee (diff) | |
| download | zig-3150458f2f4aa06c6cd99cb6ec06791f1ca05505.tar.gz zig-3150458f2f4aa06c6cd99cb6ec06791f1ca05505.zip | |
Rename printErrMsgToFile->printErrMsgToStdErr and remove `file` argument
Compilation.AllError.Message interface does not provide configurable
file handle. And since all uses of this function only use stderr,
this can be added later.
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/main.zig b/src/main.zig index 2adecd9542..7c1eb527cd 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2940,7 +2940,6 @@ const Fmt = struct { }; pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void { - const stderr_file = io.getStdErr(); var color: Color = .auto; var stdin_flag: bool = false; var check_flag: bool = false; @@ -2998,7 +2997,7 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void { defer tree.deinit(gpa); for (tree.errors) |parse_error| { - try printErrMsgToFile(gpa, parse_error, tree, "<stdin>", stderr_file, color); + try printErrMsgToStdErr(gpa, parse_error, tree, "<stdin>", color); } if (tree.errors.len != 0) { process.exit(1); @@ -3143,7 +3142,7 @@ fn fmtPathFile( defer tree.deinit(fmt.gpa); for (tree.errors) |parse_error| { - try printErrMsgToFile(fmt.gpa, parse_error, tree, file_path, std.io.getStdErr(), fmt.color); + try printErrMsgToStdErr(fmt.gpa, parse_error, tree, file_path, fmt.color); } if (tree.errors.len != 0) { fmt.any_error = true; @@ -3219,12 +3218,11 @@ fn fmtPathFile( } } -fn printErrMsgToFile( +fn printErrMsgToStdErr( gpa: *mem.Allocator, parse_error: ast.Error, tree: ast.Tree, path: []const u8, - file: fs.File, color: Color, ) !void { const lok_token = parse_error.token; @@ -3770,7 +3768,7 @@ pub fn cmdAstCheck( defer file.tree.deinit(gpa); for (file.tree.errors) |parse_error| { - try printErrMsgToFile(gpa, parse_error, file.tree, file.sub_file_path, io.getStdErr(), color); + try printErrMsgToStdErr(gpa, parse_error, file.tree, file.sub_file_path, color); } if (file.tree.errors.len != 0) { process.exit(1); @@ -3891,7 +3889,7 @@ pub fn cmdChangelist( defer file.tree.deinit(gpa); for (file.tree.errors) |parse_error| { - try printErrMsgToFile(gpa, parse_error, file.tree, old_source_file, io.getStdErr(), .auto); + try printErrMsgToStdErr(gpa, parse_error, file.tree, old_source_file, .auto); } if (file.tree.errors.len != 0) { process.exit(1); @@ -3928,7 +3926,7 @@ pub fn cmdChangelist( defer new_tree.deinit(gpa); for (new_tree.errors) |parse_error| { - try printErrMsgToFile(gpa, parse_error, new_tree, new_source_file, io.getStdErr(), .auto); + try printErrMsgToStdErr(gpa, parse_error, new_tree, new_source_file, .auto); } if (new_tree.errors.len != 0) { process.exit(1); |
