aboutsummaryrefslogtreecommitdiff
path: root/lib/std/packed_int_array.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-02-03 17:30:38 -0500
committerAndrew Kelley <andrew@ziglang.org>2020-02-03 17:30:38 -0500
commitd0b12d77267da601e69bd633fe3f56b8bf01c1cf (patch)
tree83a94a55d064f8ea35ebb9a6b3a8b4c55b191fce /lib/std/packed_int_array.zig
parent644a344715231b81189575cba52950ba43947e4f (diff)
parent0fdcd5c4cb335fcb2d637b891e60094b7a34e2b5 (diff)
downloadzig-d0b12d77267da601e69bd633fe3f56b8bf01c1cf.tar.gz
zig-d0b12d77267da601e69bd633fe3f56b8bf01c1cf.zip
Merge remote-tracking branch 'origin/master' into llvm10
Diffstat (limited to 'lib/std/packed_int_array.zig')
-rw-r--r--lib/std/packed_int_array.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/packed_int_array.zig b/lib/std/packed_int_array.zig
index bc29e985b5..3dfa55e74b 100644
--- a/lib/std/packed_int_array.zig
+++ b/lib/std/packed_int_array.zig
@@ -604,7 +604,7 @@ test "PackedIntArray at end of available memory" {
p: PackedArray,
};
- const allocator = std.heap.page_allocator;
+ const allocator = std.testing.allocator;
var pad = try allocator.create(Padded);
defer allocator.destroy(pad);
@@ -618,7 +618,7 @@ test "PackedIntSlice at end of available memory" {
}
const PackedSlice = PackedIntSlice(u11);
- const allocator = std.heap.page_allocator;
+ const allocator = std.testing.allocator;
var page = try allocator.alloc(u8, std.mem.page_size);
defer allocator.free(page);