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

1 files changed, 22 insertions, 26 deletions

diff --git a/lib/std/http/headers.zig b/lib/std/http/headers.zig
index dfe53fe750..a7a1464f99 100644
--- a/lib/std/http/headers.zig
+++ b/lib/std/http/headers.zig
@@ -83,12 +83,8 @@ const HeaderEntry = struct {
     }
 };
 
-var test_memory: [32 * 1024]u8 = undefined;
-var test_fba_state = std.heap.FixedBufferAllocator.init(&test_memory);
-const test_allocator = &test_fba_state.allocator;
-
 test "HeaderEntry" {
-    var e = try HeaderEntry.init(test_allocator, "foo", "bar", null);
+    var e = try HeaderEntry.init(testing.allocator, "foo", "bar", null);
     defer e.deinit();
     testing.expectEqualSlices(u8, "foo", e.name);
     testing.expectEqualSlices(u8, "bar", e.value);
@@ -368,7 +364,7 @@ pub const Headers = struct {
 };
 
 test "Headers.iterator" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("cookie", "somevalue", null);
@@ -390,7 +386,7 @@ test "Headers.iterator" {
 }
 
 test "Headers.contains" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("cookie", "somevalue", null);
@@ -400,7 +396,7 @@ test "Headers.contains" {
 }
 
 test "Headers.delete" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("baz", "qux", null);
@@ -428,7 +424,7 @@ test "Headers.delete" {
 }
 
 test "Headers.orderedRemove" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("baz", "qux", null);
@@ -451,7 +447,7 @@ test "Headers.orderedRemove" {
 }
 
 test "Headers.swapRemove" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("baz", "qux", null);
@@ -474,7 +470,7 @@ test "Headers.swapRemove" {
 }
 
 test "Headers.at" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("cookie", "somevalue", null);
@@ -494,7 +490,7 @@ test "Headers.at" {
 }
 
 test "Headers.getIndices" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("set-cookie", "x=1", null);
@@ -506,27 +502,27 @@ test "Headers.getIndices" {
 }
 
 test "Headers.get" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("set-cookie", "x=1", null);
     try h.append("set-cookie", "y=2", null);
 
     {
-        const v = try h.get(test_allocator, "not-present");
+        const v = try h.get(testing.allocator, "not-present");
         testing.expect(null == v);
     }
     {
-        const v = (try h.get(test_allocator, "foo")).?;
-        defer test_allocator.free(v);
+        const v = (try h.get(testing.allocator, "foo")).?;
+        defer testing.allocator.free(v);
         const e = v[0];
         testing.expectEqualSlices(u8, "foo", e.name);
         testing.expectEqualSlices(u8, "bar", e.value);
         testing.expectEqual(false, e.never_index);
     }
     {
-        const v = (try h.get(test_allocator, "set-cookie")).?;
-        defer test_allocator.free(v);
+        const v = (try h.get(testing.allocator, "set-cookie")).?;
+        defer testing.allocator.free(v);
         {
             const e = v[0];
             testing.expectEqualSlices(u8, "set-cookie", e.name);
@@ -543,30 +539,30 @@ test "Headers.get" {
 }
 
 test "Headers.getCommaSeparated" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("set-cookie", "x=1", null);
     try h.append("set-cookie", "y=2", null);
 
     {
-        const v = try h.getCommaSeparated(test_allocator, "not-present");
+        const v = try h.getCommaSeparated(testing.allocator, "not-present");
         testing.expect(null == v);
     }
     {
-        const v = (try h.getCommaSeparated(test_allocator, "foo")).?;
-        defer test_allocator.free(v);
+        const v = (try h.getCommaSeparated(testing.allocator, "foo")).?;
+        defer testing.allocator.free(v);
         testing.expectEqualSlices(u8, "bar", v);
     }
     {
-        const v = (try h.getCommaSeparated(test_allocator, "set-cookie")).?;
-        defer test_allocator.free(v);
+        const v = (try h.getCommaSeparated(testing.allocator, "set-cookie")).?;
+        defer testing.allocator.free(v);
         testing.expectEqualSlices(u8, "x=1,y=2", v);
     }
 }
 
 test "Headers.sort" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("cookie", "somevalue", null);
@@ -587,7 +583,7 @@ test "Headers.sort" {
 }
 
 test "Headers.format" {
-    var h = Headers.init(test_allocator);
+    var h = Headers.init(testing.allocator);
     defer h.deinit();
     try h.append("foo", "bar", null);
     try h.append("cookie", "somevalue", null);