diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-11-10 16:45:01 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-11-10 16:45:01 -0500 |
| commit | df89291d1ca04a5891dd48ea5f6d1a99b6006bcb (patch) | |
| tree | 83970de0fdaa7383c11f64efceff7f88d6fd9cd9 /std/mem.zig | |
| parent | e9d7623e1f0300b1b652373f2e0e7b605eaf13d1 (diff) | |
| parent | 019f18058bb74816f8754de63a219347597e06da (diff) | |
| download | zig-df89291d1ca04a5891dd48ea5f6d1a99b6006bcb.tar.gz zig-df89291d1ca04a5891dd48ea5f6d1a99b6006bcb.zip | |
Merge remote-tracking branch 'origin/master' into llvm6
Diffstat (limited to 'std/mem.zig')
| -rw-r--r-- | std/mem.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/std/mem.zig b/std/mem.zig index e37ccf011d..3cfdb25b35 100644 --- a/std/mem.zig +++ b/std/mem.zig @@ -331,8 +331,8 @@ pub fn join(allocator: &Allocator, sep: u8, strings: ...) -> %[]u8 { } test "mem.join" { - assert(eql(u8, %%join(&debug.global_allocator, ',', "a", "b", "c"), "a,b,c")); - assert(eql(u8, %%join(&debug.global_allocator, ',', "a"), "a")); + assert(eql(u8, %%join(debug.global_allocator, ',', "a", "b", "c"), "a,b,c")); + assert(eql(u8, %%join(debug.global_allocator, ',', "a"), "a")); } test "testStringEquality" { |