diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-09 09:56:24 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-09 09:56:24 -0500 |
| commit | d1d3dbc7b5bc986849db476e491300ffd18d4db5 (patch) | |
| tree | 8ab3bb2b5b8a82edf18caca6e28dc8e74ab81d11 /std/sort.zig | |
| parent | 5a8d87f5042b5ab86de7c72df4ce84a314878e40 (diff) | |
| parent | 3c094116aae459b651934663a31981cf09cdb3e4 (diff) | |
| download | zig-d1d3dbc7b5bc986849db476e491300ffd18d4db5.tar.gz zig-d1d3dbc7b5bc986849db476e491300ffd18d4db5.zip | |
Merge branch 'master' into llvm6
Diffstat (limited to 'std/sort.zig')
| -rw-r--r-- | std/sort.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/std/sort.zig b/std/sort.zig index a36a5e1747..02cb9acb2e 100644 --- a/std/sort.zig +++ b/std/sort.zig @@ -1115,7 +1115,7 @@ var fixed_buffer_mem: [100 * 1024]u8 = undefined; fn fuzzTest(rng: &std.rand.Rand) { const array_size = rng.range(usize, 0, 1000); var fixed_allocator = mem.FixedBufferAllocator.init(fixed_buffer_mem[0..]); - var array = %%fixed_allocator.allocator.alloc(IdAndValue, array_size); + var array = fixed_allocator.allocator.alloc(IdAndValue, array_size) catch unreachable; // populate with random data for (array) |*item, index| { item.id = index; |