diff options
| author | Auguste Rame <Auguste.rame@gmail.com> | 2020-04-10 11:49:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 11:49:50 -0400 |
| commit | df14578c9d3c7f455c7710ecc9bafe56eb0ec826 (patch) | |
| tree | 2501b90c7263cf662f64190e43aa66ba307eb15f /lib/std/testing.zig | |
| parent | 116c76cf82cd9e7ea3018e36dd9756f2f063143d (diff) | |
| parent | 4871345545ec9655a14d0bfe32668eda210953f7 (diff) | |
| download | zig-df14578c9d3c7f455c7710ecc9bafe56eb0ec826.tar.gz zig-df14578c9d3c7f455c7710ecc9bafe56eb0ec826.zip | |
Merge branch 'master' into nameless-fields
Diffstat (limited to 'lib/std/testing.zig')
| -rw-r--r-- | lib/std/testing.zig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/std/testing.zig b/lib/std/testing.zig index 4f527ba700..4b629156f6 100644 --- a/lib/std/testing.zig +++ b/lib/std/testing.zig @@ -7,7 +7,8 @@ pub const FailingAllocator = @import("testing/failing_allocator.zig").FailingAll pub const allocator = &allocator_instance.allocator; pub var allocator_instance = LeakCountAllocator.init(&base_allocator_instance.allocator); -pub const failing_allocator = &FailingAllocator.init(&base_allocator_instance.allocator, 0).allocator; +pub const failing_allocator = &failing_allocator_instance.allocator; +pub var failing_allocator_instance = FailingAllocator.init(&base_allocator_instance.allocator, 0); pub var base_allocator_instance = std.heap.ThreadSafeFixedBufferAllocator.init(allocator_mem[0..]); var allocator_mem: [1024 * 1024]u8 = undefined; |