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

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/std/buffer.zig b/lib/std/buffer.zig
index 42bf8e8142..077b2b615f 100644
--- a/lib/std/buffer.zig
+++ b/lib/std/buffer.zig
@@ -150,7 +150,9 @@ pub const Buffer = struct {
 };
 
 test "simple Buffer" {
-    var buf = try Buffer.init(debug.global_allocator, "");
+    var buf = try Buffer.init(testing.allocator, "");
+    defer buf.deinit();
+
     testing.expect(buf.len() == 0);
     try buf.append("hello");
     try buf.append(" ");
@@ -159,6 +161,7 @@ test "simple Buffer" {
     testing.expect(mem.eql(u8, mem.toSliceConst(u8, buf.toSliceConst().ptr), buf.toSliceConst()));
 
     var buf2 = try Buffer.initFromBuffer(buf);
+    defer buf2.deinit();
     testing.expect(buf.eql(buf2.toSliceConst()));
 
     testing.expect(buf.startsWith("hell"));
@@ -169,14 +172,16 @@ test "simple Buffer" {
 }
 
 test "Buffer.initSize" {
-    var buf = try Buffer.initSize(debug.global_allocator, 3);
+    var buf = try Buffer.initSize(testing.allocator, 3);
+    defer buf.deinit();
     testing.expect(buf.len() == 3);
     try buf.append("hello");
     testing.expect(mem.eql(u8, buf.toSliceConst()[3..], "hello"));
 }
 
 test "Buffer.initCapacity" {
-    var buf = try Buffer.initCapacity(debug.global_allocator, 10);
+    var buf = try Buffer.initCapacity(testing.allocator, 10);
+    defer buf.deinit();
     testing.expect(buf.len() == 0);
     testing.expect(buf.capacity() >= 10);
     const old_cap = buf.capacity();