From 3c2e69d5d6432536c2d3cfe99cdabd31ac503abf Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 29 Dec 2021 19:04:03 +0000 Subject: [PATCH] extract windowsSafe() --- src/main.zig | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main.zig b/src/main.zig index d6216c5..5e15d09 100644 --- a/src/main.zig +++ b/src/main.zig @@ -41,13 +41,21 @@ fn nextLine(reader: FileReader, buffer: []u8) !?[]const u8 { buffer, '\n', )) orelse return null; - // trim annoying windows-only carriage return character + return windowsSafe(line); +} + +// trim annoying windows-only carriage return character +fn windowsSafe(line: []u8) []u8 { if (os.tag == .windows) { - line = mem.trimRight(u8, line, "\r"); + return mem.trimRight(u8, line, "\r"); } return line; } -test "basic test" { - try testing.expectEqual(10, 3 + 7); +test "windowsSage strips carriage return on windows" { + if (os.tag == .windows) { + try testing.expectEqualSlices(u8, "line\n\r", "line\n"); + } else { + try testing.expectEqualSlices(u8, "line\n\r", "line\n\r"); + } }