Merge remote-tracking branch 'origin/master' into sub-architecture-annihilation

1 files changed, 4 insertions, 2 deletions

diff --git a/test/tests.zig b/test/tests.zig
index f12f7f83d4..e9fdde2e4b 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -650,8 +650,10 @@ pub const StackTracesContext = struct {
             const got: []const u8 = got_result: {
                 var buf = try Buffer.initSize(b.allocator, 0);
                 defer buf.deinit();
-                var bytes = stderr.toSliceConst();
-                if (bytes.len != 0 and bytes[bytes.len - 1] == '\n') bytes = bytes[0 .. bytes.len - 1];
+                const bytes = if (stderr.endsWith("\n"))
+                    stderr.toSliceConst()[0 .. stderr.len() - 1]
+                else
+                    stderr.toSliceConst()[0..stderr.len()];
                 var it = mem.separate(bytes, "\n");
                 process_lines: while (it.next()) |line| {
                     if (line.len == 0) continue;