authorgravatar for greenfork.lists@yandex.comDmitry Matveyev <greenfork.lists@yandex.com> 2021-06-14 22:13:32+06:00
committergravatar for greenfork.lists@yandex.comDmitry Matveyev <greenfork.lists@yandex.com> 2021-06-14 22:13:32+06:00
log3150458f2f4aa06c6cd99cb6ec06791f1ca05505
tree1599c610564cfeb5ed3234facf868d73b631f1ee
parent382f87abac469db7cbc4968ca03e02cc1af5f6ee

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.

1 files changed, 6 insertions(+), 8 deletions(-)

src/main.zig+6-8
......@@ -2940,7 +2940,6 @@ const Fmt = struct {
29402940};
29412941
29422942pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
2943 const stderr_file = io.getStdErr();
29442943 var color: Color = .auto;
29452944 var stdin_flag: bool = false;
29462945 var check_flag: bool = false;
......@@ -2998,7 +2997,7 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
29982997 defer tree.deinit(gpa);
29992998
30002999 for (tree.errors) |parse_error| {
3001 try printErrMsgToFile(gpa, parse_error, tree, "<stdin>", stderr_file, color);
3000 try printErrMsgToStdErr(gpa, parse_error, tree, "<stdin>", color);
30023001 }
30033002 if (tree.errors.len != 0) {
30043003 process.exit(1);
......@@ -3143,7 +3142,7 @@ fn fmtPathFile(
31433142 defer tree.deinit(fmt.gpa);
31443143
31453144 for (tree.errors) |parse_error| {
3146 try printErrMsgToFile(fmt.gpa, parse_error, tree, file_path, std.io.getStdErr(), fmt.color);
3145 try printErrMsgToStdErr(fmt.gpa, parse_error, tree, file_path, fmt.color);
31473146 }
31483147 if (tree.errors.len != 0) {
31493148 fmt.any_error = true;
......@@ -3219,12 +3218,11 @@ fn fmtPathFile(
32193218 }
32203219}
32213220
3222fn printErrMsgToFile(
3221fn printErrMsgToStdErr(
32233222 gpa: *mem.Allocator,
32243223 parse_error: ast.Error,
32253224 tree: ast.Tree,
32263225 path: []const u8,
3227 file: fs.File,
32283226 color: Color,
32293227) !void {
32303228 const lok_token = parse_error.token;
......@@ -3770,7 +3768,7 @@ pub fn cmdAstCheck(
37703768 defer file.tree.deinit(gpa);
37713769
37723770 for (file.tree.errors) |parse_error| {
3773 try printErrMsgToFile(gpa, parse_error, file.tree, file.sub_file_path, io.getStdErr(), color);
3771 try printErrMsgToStdErr(gpa, parse_error, file.tree, file.sub_file_path, color);
37743772 }
37753773 if (file.tree.errors.len != 0) {
37763774 process.exit(1);
......@@ -3891,7 +3889,7 @@ pub fn cmdChangelist(
38913889 defer file.tree.deinit(gpa);
38923890
38933891 for (file.tree.errors) |parse_error| {
3894 try printErrMsgToFile(gpa, parse_error, file.tree, old_source_file, io.getStdErr(), .auto);
3892 try printErrMsgToStdErr(gpa, parse_error, file.tree, old_source_file, .auto);
38953893 }
38963894 if (file.tree.errors.len != 0) {
38973895 process.exit(1);
......@@ -3928,7 +3926,7 @@ pub fn cmdChangelist(
39283926 defer new_tree.deinit(gpa);
39293927
39303928 for (new_tree.errors) |parse_error| {
3931 try printErrMsgToFile(gpa, parse_error, new_tree, new_source_file, io.getStdErr(), .auto);
3929 try printErrMsgToStdErr(gpa, parse_error, new_tree, new_source_file, .auto);
39323930 }
39333931 if (new_tree.errors.len != 0) {
39343932 process.exit(1);