From 58551ff7da3b6c5340f55751cfa38a0e5bc04165 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 29 Dec 2021 19:42:30 +0000 Subject: [PATCH] Clean up windowsSafe() --- src/main.zig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main.zig b/src/main.zig index 2b239b7..4a6d4fd 100644 --- a/src/main.zig +++ b/src/main.zig @@ -45,17 +45,21 @@ fn nextLine(reader: FileReader, buffer: []u8) !?[]const u8 { } // trim annoying windows-only carriage return character -fn windowsSafe(line: []u8) []u8 { +fn windowsSafe(line: []const u8) []const u8 { if (os.tag == .windows) { return mem.trimRight(u8, line, "\r"); } return line; } -test "windowsSage strips carriage return on windows" { +test "windowsSafe strips carriage return on windows" { + const input = "line\n\r"; + const result = windowsSafe(input); if (os.tag == .windows) { - try testing.expectEqualSlices(u8, "line\n\r", "line\n"); + // strips the carriage return if windows + try testing.expectEqualSlices(u8, "line\n", result); } else { - try testing.expectEqualSlices(u8, "line\n\r", "line\n\r"); + // doesn't change the line if not windows + try testing.expectEqualSlices(u8, input, result); } }