authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-03-26 03:49:36+01:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-03-27 01:55:42-04:00
log71d878ba5051dd7bb3db15dcfba0f70cff3c225e
treed071e4d47f8071b25612d3c95ddb111610b9e947
parent77ff6bc656e497c81a0320cb1e99be0e5e596894

std.zig: remove extraneous newlines in log messages


2 files changed, 9 insertions(+), 9 deletions(-)

lib/std/zig/LibCInstallation.zig+7-7
...@@ -67,34 +67,34 @@ pub fn parse(...@@ -67,34 +67,34 @@ pub fn parse(
67 }67 }
68 inline for (fields, 0..) |field, i| {68 inline for (fields, 0..) |field, i| {
69 if (!found_keys[i].found) {69 if (!found_keys[i].found) {
70 log.err("missing field: {s}\n", .{field.name});70 log.err("missing field: {s}", .{field.name});
71 return error.ParseError;71 return error.ParseError;
72 }72 }
73 }73 }
74 if (self.include_dir == null) {74 if (self.include_dir == null) {
75 log.err("include_dir may not be empty\n", .{});75 log.err("include_dir may not be empty", .{});
76 return error.ParseError;76 return error.ParseError;
77 }77 }
78 if (self.sys_include_dir == null) {78 if (self.sys_include_dir == null) {
79 log.err("sys_include_dir may not be empty\n", .{});79 log.err("sys_include_dir may not be empty", .{});
80 return error.ParseError;80 return error.ParseError;
81 }81 }
8282
83 const os_tag = target.os.tag;83 const os_tag = target.os.tag;
84 if (self.crt_dir == null and !target.isDarwin()) {84 if (self.crt_dir == null and !target.isDarwin()) {
85 log.err("crt_dir may not be empty for {s}\n", .{@tagName(os_tag)});85 log.err("crt_dir may not be empty for {s}", .{@tagName(os_tag)});
86 return error.ParseError;86 return error.ParseError;
87 }87 }
8888
89 if (self.msvc_lib_dir == null and os_tag == .windows and target.abi == .msvc) {89 if (self.msvc_lib_dir == null and os_tag == .windows and target.abi == .msvc) {
90 log.err("msvc_lib_dir may not be empty for {s}-{s}\n", .{90 log.err("msvc_lib_dir may not be empty for {s}-{s}", .{
91 @tagName(os_tag),91 @tagName(os_tag),
92 @tagName(target.abi),92 @tagName(target.abi),
93 });93 });
94 return error.ParseError;94 return error.ParseError;
95 }95 }
96 if (self.kernel32_lib_dir == null and os_tag == .windows and target.abi == .msvc) {96 if (self.kernel32_lib_dir == null and os_tag == .windows and target.abi == .msvc) {
97 log.err("kernel32_lib_dir may not be empty for {s}-{s}\n", .{97 log.err("kernel32_lib_dir may not be empty for {s}-{s}", .{
98 @tagName(os_tag),98 @tagName(os_tag),
99 @tagName(target.abi),99 @tagName(target.abi),
100 });100 });
...@@ -102,7 +102,7 @@ pub fn parse(...@@ -102,7 +102,7 @@ pub fn parse(
102 }102 }
103103
104 if (self.gcc_dir == null and os_tag == .haiku) {104 if (self.gcc_dir == null and os_tag == .haiku) {
105 log.err("gcc_dir may not be empty for {s}\n", .{@tagName(os_tag)});105 log.err("gcc_dir may not be empty for {s}", .{@tagName(os_tag)});
106 return error.ParseError;106 return error.ParseError;
107 }107 }
108108
lib/std/zig/system.zig+2-2
...@@ -1017,7 +1017,7 @@ fn detectAbiAndDynamicLinker(...@@ -1017,7 +1017,7 @@ fn detectAbiAndDynamicLinker(
1017 error.FileTooBig,1017 error.FileTooBig,
1018 error.Unexpected,1018 error.Unexpected,
1019 => |e| {1019 => |e| {
1020 std.log.warn("Encountered error: {s}, falling back to default ABI and dynamic linker.\n", .{@errorName(e)});1020 std.log.warn("Encountered error: {s}, falling back to default ABI and dynamic linker.", .{@errorName(e)});
1021 return defaultAbiAndDynamicLinker(cpu, os, query);1021 return defaultAbiAndDynamicLinker(cpu, os, query);
1022 },1022 },
10231023
...@@ -1065,7 +1065,7 @@ fn detectAbiAndDynamicLinker(...@@ -1065,7 +1065,7 @@ fn detectAbiAndDynamicLinker(
1065 error.NameTooLong,1065 error.NameTooLong,
1066 // Finally, we fall back on the standard path.1066 // Finally, we fall back on the standard path.
1067 => |e| {1067 => |e| {
1068 std.log.warn("Encountered error: {s}, falling back to default ABI and dynamic linker.\n", .{@errorName(e)});1068 std.log.warn("Encountered error: {s}, falling back to default ABI and dynamic linker.", .{@errorName(e)});
1069 return defaultAbiAndDynamicLinker(cpu, os, query);1069 return defaultAbiAndDynamicLinker(cpu, os, query);
1070 },1070 },
1071 };1071 };