aboutsummaryrefslogtreecommitdiff
path: root/lib/std/os
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-01-30 10:01:40 -0500
committerGitHub <noreply@github.com>2020-01-30 10:01:40 -0500
commit65b1a4953fd5b87f30260beb363d0e968dc8e291 (patch)
treeab01d1b6699d103b4b075807f47c136926404f92 /lib/std/os
parente3a383a661aaf9b43016358e2951ff9d792f240e (diff)
parent9c196efa2afe0e337ac0b16bd1138e89393f6106 (diff)
downloadzig-65b1a4953fd5b87f30260beb363d0e968dc8e291.tar.gz
zig-65b1a4953fd5b87f30260beb363d0e968dc8e291.zip
Merge pull request #4324 from fengb/testing-allocator
Remove debug.global_allocator in favor of testing.allocator
Diffstat (limited to 'lib/std/os')
-rw-r--r--lib/std/os/test.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/os/test.zig b/lib/std/os/test.zig
index f71e80c7d7..a872c03fde 100644
--- a/lib/std/os/test.zig
+++ b/lib/std/os/test.zig
@@ -9,7 +9,7 @@ const elf = std.elf;
const File = std.fs.File;
const Thread = std.Thread;
-const a = std.debug.global_allocator;
+const a = std.testing.allocator;
const builtin = @import("builtin");
const AtomicRmwOp = builtin.AtomicRmwOp;
@@ -235,8 +235,8 @@ test "pipe" {
}
test "argsAlloc" {
- var args = try std.process.argsAlloc(std.heap.page_allocator);
- std.process.argsFree(std.heap.page_allocator, args);
+ var args = try std.process.argsAlloc(std.testing.allocator);
+ std.process.argsFree(std.testing.allocator, args);
}
test "memfd_create" {