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

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/std/array_list.zig b/lib/std/array_list.zig
index 64f13eff9b..b028390465 100644
--- a/lib/std/array_list.zig
+++ b/lib/std/array_list.zig
@@ -320,7 +320,7 @@ test "std.ArrayList.basic" {
 }
 
 test "std.ArrayList.orderedRemove" {
-    var list = ArrayList(i32).init(debug.global_allocator);
+    var list = ArrayList(i32).init(testing.allocator);
     defer list.deinit();
 
     try list.append(1);
@@ -347,7 +347,7 @@ test "std.ArrayList.orderedRemove" {
 }
 
 test "std.ArrayList.swapRemove" {
-    var list = ArrayList(i32).init(debug.global_allocator);
+    var list = ArrayList(i32).init(testing.allocator);
     defer list.deinit();
 
     try list.append(1);
@@ -374,7 +374,7 @@ test "std.ArrayList.swapRemove" {
 }
 
 test "std.ArrayList.swapRemoveOrError" {
-    var list = ArrayList(i32).init(debug.global_allocator);
+    var list = ArrayList(i32).init(testing.allocator);
     defer list.deinit();
 
     // Test just after initialization
@@ -402,7 +402,7 @@ test "std.ArrayList.swapRemoveOrError" {
 }
 
 test "std.ArrayList.insert" {
-    var list = ArrayList(i32).init(debug.global_allocator);
+    var list = ArrayList(i32).init(testing.allocator);
     defer list.deinit();
 
     try list.append(1);
@@ -416,7 +416,7 @@ test "std.ArrayList.insert" {
 }
 
 test "std.ArrayList.insertSlice" {
-    var list = ArrayList(i32).init(debug.global_allocator);
+    var list = ArrayList(i32).init(testing.allocator);
     defer list.deinit();
 
     try list.append(1);
@@ -443,7 +443,8 @@ const Item = struct {
 };
 
 test "std.ArrayList: ArrayList(T) of struct T" {
-    var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(debug.global_allocator) };
-    try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) });
+    var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(testing.allocator) };
+    defer root.sub_items.deinit();
+    try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(testing.allocator) });
     testing.expect(root.sub_items.items[0].integer == 42);
 }