Merge remote-tracking branch 'origin/master' into llvm10

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/std/sort.zig b/lib/std/sort.zig
index df9702b325..938c5e98f1 100644
--- a/lib/std/sort.zig
+++ b/lib/std/sort.zig
@@ -1220,16 +1220,16 @@ test "sort fuzz testing" {
     const test_case_count = 10;
     var i: usize = 0;
     while (i < test_case_count) : (i += 1) {
-        fuzzTest(&prng.random);
+        try fuzzTest(&prng.random);
     }
 }
 
 var fixed_buffer_mem: [100 * 1024]u8 = undefined;
 
-fn fuzzTest(rng: *std.rand.Random) void {
+fn fuzzTest(rng: *std.rand.Random) !void {
     const array_size = rng.range(usize, 0, 1000);
-    var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
-    var array = fixed_allocator.allocator.alloc(IdAndValue, array_size) catch unreachable;
+    var array = try testing.allocator.alloc(IdAndValue, array_size);
+    defer testing.allocator.free(array);
     // populate with random data
     for (array) |*item, index| {
         item.id = index;