Merge branch 'kristate-zig-backport-std.mem.join'

1 files changed, 5 insertions, 2 deletions

diff --git a/std/mem.zig b/std/mem.zig
index 48d1cb930c..a6cbae744f 100644
--- a/std/mem.zig
+++ b/std/mem.zig
@@ -911,8 +911,11 @@ pub fn join(allocator: *Allocator, separator: []const u8, slices: []const []cons
 }
 
 test "mem.join" {
-    assert(eql(u8, try join(debug.global_allocator, ",", [][]const u8{ "a", "b", "c" }), "a,b,c"));
-    assert(eql(u8, try join(debug.global_allocator, ",", [][]const u8{"a"}), "a"));
+    var buf: [1024]u8 = undefined;
+    const a = &std.heap.FixedBufferAllocator.init(&buf).allocator;
+    assert(eql(u8, try join(a, ",", [][]const u8{ "a", "b", "c" }), "a,b,c"));
+    assert(eql(u8, try join(a, ",", [][]const u8{"a"}), "a"));
+    assert(eql(u8, try join(a, ",", [][]const u8{ "a", "", "b", "", "c" }), "a,,b,,c"));
 }
 
 test "testStringEquality" {