authorgravatar for benjamin.feng@glassdoor.comBenjamin Feng <benjamin.feng@glassdoor.com> 2020-01-29 12:21:29-06:00
committergravatar for benjamin.feng@glassdoor.comBenjamin Feng <benjamin.feng@glassdoor.com> 2020-01-29 12:21:29-06:00
log4d134a01f5a8baae346783f19d9b5db8c8256d32
treeaa75eac95360a47502c3a278329d2d775d53d571
parent34706dad3ff22f73197fbf5e9cbf4628f698a74d

Move debug.global_allocator to testing.allocator

23 files changed, 84 insertions(+), 73 deletions(-)

doc/docgen.zig+1-1
......@@ -672,7 +672,7 @@ const TermState = enum {
672672
673673test "term color" {
674674 const input_bytes = "A\x1b[32;1mgreen\x1b[0mB";
675 const result = try termColor(std.debug.global_allocator, input_bytes);
675 const result = try termColor(std.testing.allocator, input_bytes);
676676 testing.expectEqualSlices(u8, "A<span class=\"t32\">green</span>B", result);
677677}
678678
lib/std/array_list.zig+7-7
......@@ -320,7 +320,7 @@ test "std.ArrayList.basic" {
320320}
321321
322322test "std.ArrayList.orderedRemove" {
323 var list = ArrayList(i32).init(debug.global_allocator);
323 var list = ArrayList(i32).init(testing.allocator);
324324 defer list.deinit();
325325
326326 try list.append(1);
......@@ -347,7 +347,7 @@ test "std.ArrayList.orderedRemove" {
347347}
348348
349349test "std.ArrayList.swapRemove" {
350 var list = ArrayList(i32).init(debug.global_allocator);
350 var list = ArrayList(i32).init(testing.allocator);
351351 defer list.deinit();
352352
353353 try list.append(1);
......@@ -374,7 +374,7 @@ test "std.ArrayList.swapRemove" {
374374}
375375
376376test "std.ArrayList.swapRemoveOrError" {
377 var list = ArrayList(i32).init(debug.global_allocator);
377 var list = ArrayList(i32).init(testing.allocator);
378378 defer list.deinit();
379379
380380 // Test just after initialization
......@@ -402,7 +402,7 @@ test "std.ArrayList.swapRemoveOrError" {
402402}
403403
404404test "std.ArrayList.insert" {
405 var list = ArrayList(i32).init(debug.global_allocator);
405 var list = ArrayList(i32).init(testing.allocator);
406406 defer list.deinit();
407407
408408 try list.append(1);
......@@ -416,7 +416,7 @@ test "std.ArrayList.insert" {
416416}
417417
418418test "std.ArrayList.insertSlice" {
419 var list = ArrayList(i32).init(debug.global_allocator);
419 var list = ArrayList(i32).init(testing.allocator);
420420 defer list.deinit();
421421
422422 try list.append(1);
......@@ -443,7 +443,7 @@ const Item = struct {
443443};
444444
445445test "std.ArrayList: ArrayList(T) of struct T" {
446 var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(debug.global_allocator) };
447 try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) });
446 var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(testing.allocator) };
447 try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(testing.allocator) });
448448 testing.expect(root.sub_items.items[0].integer == 42);
449449}
lib/std/buffer.zig+3-3
......@@ -150,7 +150,7 @@ pub const Buffer = struct {
150150};
151151
152152test "simple Buffer" {
153 var buf = try Buffer.init(debug.global_allocator, "");
153 var buf = try Buffer.init(testing.allocator, "");
154154 testing.expect(buf.len() == 0);
155155 try buf.append("hello");
156156 try buf.append(" ");
......@@ -169,14 +169,14 @@ test "simple Buffer" {
169169}
170170
171171test "Buffer.initSize" {
172 var buf = try Buffer.initSize(debug.global_allocator, 3);
172 var buf = try Buffer.initSize(testing.allocator, 3);
173173 testing.expect(buf.len() == 3);
174174 try buf.append("hello");
175175 testing.expect(mem.eql(u8, buf.toSliceConst()[3..], "hello"));
176176}
177177
178178test "Buffer.initCapacity" {
179 var buf = try Buffer.initCapacity(debug.global_allocator, 10);
179 var buf = try Buffer.initCapacity(testing.allocator, 10);
180180 testing.expect(buf.len() == 0);
181181 testing.expect(buf.capacity() >= 10);
182182 const old_cap = buf.capacity();
lib/std/debug.zig+4-3
......@@ -20,7 +20,7 @@ const windows = std.os.windows;
2020pub const leb = @import("debug/leb128.zig");
2121
2222pub const FailingAllocator = @import("debug/failing_allocator.zig").FailingAllocator;
23pub const failing_allocator = &FailingAllocator.init(global_allocator, 0).allocator;
23pub const failing_allocator = &FailingAllocator.init(&global_fixed_allocator.allocator, 0).allocator;
2424
2525pub const runtime_safety = switch (builtin.mode) {
2626 .Debug, .ReleaseSafe => true,
......@@ -2192,8 +2192,9 @@ fn readInitialLength(comptime E: type, in_stream: *io.InStream(E), is_64: *bool)
21922192 }
21932193}
21942194
2195/// This should only be used in temporary test programs.
2196pub const global_allocator = &global_fixed_allocator.allocator;
2195pub const global_allocator = blk: {
2196 @compileError("Please switch to std.testing.allocator.");
2197};
21972198var global_fixed_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(global_allocator_mem[0..]);
21982199var global_allocator_mem: [100 * 1024]u8 = undefined;
21992200
lib/std/fifo.zig+2-2
......@@ -347,7 +347,7 @@ pub fn LinearFifo(
347347}
348348
349349test "LinearFifo(u8, .Dynamic)" {
350 var fifo = LinearFifo(u8, .Dynamic).init(debug.global_allocator);
350 var fifo = LinearFifo(u8, .Dynamic).init(testing.allocator);
351351 defer fifo.deinit();
352352
353353 try fifo.write("HELLO");
......@@ -422,7 +422,7 @@ test "LinearFifo" {
422422 var fifo = switch (bt) {
423423 .Static => FifoType.init(),
424424 .Slice => FifoType.init(buf[0..]),
425 .Dynamic => FifoType.init(debug.global_allocator),
425 .Dynamic => FifoType.init(testing.allocator),
426426 };
427427 defer fifo.deinit();
428428
lib/std/fmt.zig+5-5
......@@ -1598,7 +1598,7 @@ test "hexToBytes" {
15981598test "formatIntValue with comptime_int" {
15991599 const value: comptime_int = 123456789123456789;
16001600
1601 var buf = try std.Buffer.init(std.debug.global_allocator, "");
1601 var buf = try std.Buffer.init(std.testing.allocator, "");
16021602 try formatIntValue(value, "", FormatOptions{}, &buf, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append);
16031603 std.testing.expect(mem.eql(u8, buf.toSlice(), "123456789123456789"));
16041604}
......@@ -1652,19 +1652,19 @@ test "formatType max_depth" {
16521652 inst.a = &inst;
16531653 inst.tu.ptr = &inst.tu;
16541654
1655 var buf0 = try std.Buffer.init(std.debug.global_allocator, "");
1655 var buf0 = try std.Buffer.init(std.testing.allocator, "");
16561656 try formatType(inst, "", FormatOptions{}, &buf0, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 0);
16571657 std.testing.expect(mem.eql(u8, buf0.toSlice(), "S{ ... }"));
16581658
1659 var buf1 = try std.Buffer.init(std.debug.global_allocator, "");
1659 var buf1 = try std.Buffer.init(std.testing.allocator, "");
16601660 try formatType(inst, "", FormatOptions{}, &buf1, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 1);
16611661 std.testing.expect(mem.eql(u8, buf1.toSlice(), "S{ .a = S{ ... }, .tu = TU{ ... }, .e = E.Two, .vec = (10.200,2.220) }"));
16621662
1663 var buf2 = try std.Buffer.init(std.debug.global_allocator, "");
1663 var buf2 = try std.Buffer.init(std.testing.allocator, "");
16641664 try formatType(inst, "", FormatOptions{}, &buf2, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 2);
16651665 std.testing.expect(mem.eql(u8, buf2.toSlice(), "S{ .a = S{ .a = S{ ... }, .tu = TU{ ... }, .e = E.Two, .vec = (10.200,2.220) }, .tu = TU{ .ptr = TU{ ... } }, .e = E.Two, .vec = (10.200,2.220) }"));
16661666
1667 var buf3 = try std.Buffer.init(std.debug.global_allocator, "");
1667 var buf3 = try std.Buffer.init(std.testing.allocator, "");
16681668 try formatType(inst, "", FormatOptions{}, &buf3, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 3);
16691669 std.testing.expect(mem.eql(u8, buf3.toSlice(), "S{ .a = S{ .a = S{ .a = S{ ... }, .tu = TU{ ... }, .e = E.Two, .vec = (10.200,2.220) }, .tu = TU{ .ptr = TU{ ... } }, .e = E.Two, .vec = (10.200,2.220) }, .tu = TU{ .ptr = TU{ .ptr = TU{ ... } } }, .e = E.Two, .vec = (10.200,2.220) }"));
16701670}
lib/std/fs/path.zig+8-8
......@@ -665,7 +665,7 @@ pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {
665665}
666666
667667test "resolve" {
668 const cwd = try process.getCwdAlloc(debug.global_allocator);
668 const cwd = try process.getCwdAlloc(testing.allocator);
669669 if (builtin.os == .windows) {
670670 if (windowsParsePath(cwd).kind == WindowsPath.Kind.Drive) {
671671 cwd[0] = asciiUpper(cwd[0]);
......@@ -683,11 +683,11 @@ test "resolveWindows" {
683683 return error.SkipZigTest;
684684 }
685685 if (builtin.os == .windows) {
686 const cwd = try process.getCwdAlloc(debug.global_allocator);
686 const cwd = try process.getCwdAlloc(testing.allocator);
687687 const parsed_cwd = windowsParsePath(cwd);
688688 {
689689 const result = testResolveWindows(&[_][]const u8{ "/usr/local", "lib\\zig\\std\\array_list.zig" });
690 const expected = try join(debug.global_allocator, &[_][]const u8{
690 const expected = try join(testing.allocator, &[_][]const u8{
691691 parsed_cwd.disk_designator,
692692 "usr\\local\\lib\\zig\\std\\array_list.zig",
693693 });
......@@ -698,7 +698,7 @@ test "resolveWindows" {
698698 }
699699 {
700700 const result = testResolveWindows(&[_][]const u8{ "usr/local", "lib\\zig" });
701 const expected = try join(debug.global_allocator, &[_][]const u8{
701 const expected = try join(testing.allocator, &[_][]const u8{
702702 cwd,
703703 "usr\\local\\lib\\zig",
704704 });
......@@ -738,11 +738,11 @@ test "resolvePosix" {
738738}
739739
740740fn testResolveWindows(paths: []const []const u8) []u8 {
741 return resolveWindows(debug.global_allocator, paths) catch unreachable;
741 return resolveWindows(testing.allocator, paths) catch unreachable;
742742}
743743
744744fn testResolvePosix(paths: []const []const u8) []u8 {
745 return resolvePosix(debug.global_allocator, paths) catch unreachable;
745 return resolvePosix(testing.allocator, paths) catch unreachable;
746746}
747747
748748/// If the path is a file in the current directory (no directory component)
......@@ -1166,11 +1166,11 @@ test "relative" {
11661166}
11671167
11681168fn testRelativePosix(from: []const u8, to: []const u8, expected_output: []const u8) void {
1169 const result = relativePosix(debug.global_allocator, from, to) catch unreachable;
1169 const result = relativePosix(testing.allocator, from, to) catch unreachable;
11701170 testing.expectEqualSlices(u8, expected_output, result);
11711171}
11721172
11731173fn testRelativeWindows(from: []const u8, to: []const u8, expected_output: []const u8) void {
1174 const result = relativeWindows(debug.global_allocator, from, to) catch unreachable;
1174 const result = relativeWindows(testing.allocator, from, to) catch unreachable;
11751175 testing.expectEqualSlices(u8, expected_output, result);
11761176}
lib/std/heap.zig+4
......@@ -711,6 +711,10 @@ pub const ThreadSafeFixedBufferAllocator = blk: {
711711 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
712712 return old_mem[0..new_size];
713713 }
714
715 pub fn reset(self: *ThreadSafeFixedBufferAllocator) void {
716 self.end_index = 0;
717 }
714718 };
715719 }
716720};
lib/std/linked_list.zig+3-3
......@@ -143,7 +143,7 @@ pub fn SinglyLinkedList(comptime T: type) type {
143143}
144144
145145test "basic SinglyLinkedList test" {
146 const allocator = debug.global_allocator;
146 const allocator = testing.allocator;
147147 var list = SinglyLinkedList(u32).init();
148148
149149 var one = try list.createNode(1, allocator);
......@@ -404,7 +404,7 @@ pub fn TailQueue(comptime T: type) type {
404404}
405405
406406test "basic TailQueue test" {
407 const allocator = debug.global_allocator;
407 const allocator = testing.allocator;
408408 var list = TailQueue(u32).init();
409409
410410 var one = try list.createNode(1, allocator);
......@@ -456,7 +456,7 @@ test "basic TailQueue test" {
456456}
457457
458458test "TailQueue concatenation" {
459 const allocator = debug.global_allocator;
459 const allocator = testing.allocator;
460460 var list1 = TailQueue(u32).init();
461461 var list2 = TailQueue(u32).init();
462462
lib/std/os/test.zig+1-1
......@@ -9,7 +9,7 @@ const elf = std.elf;
99const File = std.fs.File;
1010const Thread = std.Thread;
1111
12const a = std.debug.global_allocator;
12const a = std.testing.allocator;
1313
1414const builtin = @import("builtin");
1515const AtomicRmwOp = builtin.AtomicRmwOp;
lib/std/priority_queue.zig+19-19
......@@ -1,10 +1,10 @@
11const std = @import("std.zig");
22const Allocator = std.mem.Allocator;
3const debug = std.debug;
4const assert = debug.assert;
5const expect = std.testing.expect;
6const expectEqual = std.testing.expectEqual;
7const expectError = std.testing.expectError;
3const assert = std.debug.assert;
4const testing = std.testing;
5const expect = testing.expect;
6const expectEqual = testing.expectEqual;
7const expectError = testing.expectError;
88
99/// Priority queue for storing generic data. Initialize with `init`.
1010pub fn PriorityQueue(comptime T: type) type {
......@@ -239,7 +239,7 @@ fn greaterThan(a: u32, b: u32) bool {
239239const PQ = PriorityQueue(u32);
240240
241241test "std.PriorityQueue: add and remove min heap" {
242 var queue = PQ.init(debug.global_allocator, lessThan);
242 var queue = PQ.init(testing.allocator, lessThan);
243243 defer queue.deinit();
244244
245245 try queue.add(54);
......@@ -257,7 +257,7 @@ test "std.PriorityQueue: add and remove min heap" {
257257}
258258
259259test "std.PriorityQueue: add and remove same min heap" {
260 var queue = PQ.init(debug.global_allocator, lessThan);
260 var queue = PQ.init(testing.allocator, lessThan);
261261 defer queue.deinit();
262262
263263 try queue.add(1);
......@@ -275,14 +275,14 @@ test "std.PriorityQueue: add and remove same min heap" {
275275}
276276
277277test "std.PriorityQueue: removeOrNull on empty" {
278 var queue = PQ.init(debug.global_allocator, lessThan);
278 var queue = PQ.init(testing.allocator, lessThan);
279279 defer queue.deinit();
280280
281281 expect(queue.removeOrNull() == null);
282282}
283283
284284test "std.PriorityQueue: edge case 3 elements" {
285 var queue = PQ.init(debug.global_allocator, lessThan);
285 var queue = PQ.init(testing.allocator, lessThan);
286286 defer queue.deinit();
287287
288288 try queue.add(9);
......@@ -294,7 +294,7 @@ test "std.PriorityQueue: edge case 3 elements" {
294294}
295295
296296test "std.PriorityQueue: peek" {
297 var queue = PQ.init(debug.global_allocator, lessThan);
297 var queue = PQ.init(testing.allocator, lessThan);
298298 defer queue.deinit();
299299
300300 expect(queue.peek() == null);
......@@ -306,7 +306,7 @@ test "std.PriorityQueue: peek" {
306306}
307307
308308test "std.PriorityQueue: sift up with odd indices" {
309 var queue = PQ.init(debug.global_allocator, lessThan);
309 var queue = PQ.init(testing.allocator, lessThan);
310310 defer queue.deinit();
311311 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };
312312 for (items) |e| {
......@@ -320,7 +320,7 @@ test "std.PriorityQueue: sift up with odd indices" {
320320}
321321
322322test "std.PriorityQueue: addSlice" {
323 var queue = PQ.init(debug.global_allocator, lessThan);
323 var queue = PQ.init(testing.allocator, lessThan);
324324 defer queue.deinit();
325325 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };
326326 try queue.addSlice(items[0..]);
......@@ -333,8 +333,8 @@ test "std.PriorityQueue: addSlice" {
333333
334334test "std.PriorityQueue: fromOwnedSlice" {
335335 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };
336 const heap_items = try std.mem.dupe(debug.global_allocator, u32, items[0..]);
337 var queue = PQ.fromOwnedSlice(debug.global_allocator, lessThan, heap_items[0..]);
336 const heap_items = try std.mem.dupe(testing.allocator, u32, items[0..]);
337 var queue = PQ.fromOwnedSlice(testing.allocator, lessThan, heap_items[0..]);
338338 defer queue.deinit();
339339
340340 const sorted_items = [_]u32{ 1, 2, 5, 6, 7, 7, 11, 12, 13, 14, 15, 15, 16, 21, 22, 24, 24, 25 };
......@@ -344,7 +344,7 @@ test "std.PriorityQueue: fromOwnedSlice" {
344344}
345345
346346test "std.PriorityQueue: add and remove max heap" {
347 var queue = PQ.init(debug.global_allocator, greaterThan);
347 var queue = PQ.init(testing.allocator, greaterThan);
348348 defer queue.deinit();
349349
350350 try queue.add(54);
......@@ -362,7 +362,7 @@ test "std.PriorityQueue: add and remove max heap" {
362362}
363363
364364test "std.PriorityQueue: add and remove same max heap" {
365 var queue = PQ.init(debug.global_allocator, greaterThan);
365 var queue = PQ.init(testing.allocator, greaterThan);
366366 defer queue.deinit();
367367
368368 try queue.add(1);
......@@ -380,8 +380,8 @@ test "std.PriorityQueue: add and remove same max heap" {
380380}
381381
382382test "std.PriorityQueue: iterator" {
383 var queue = PQ.init(debug.global_allocator, lessThan);
384 var map = std.AutoHashMap(u32, void).init(debug.global_allocator);
383 var queue = PQ.init(testing.allocator, lessThan);
384 var map = std.AutoHashMap(u32, void).init(testing.allocator);
385385 defer {
386386 queue.deinit();
387387 map.deinit();
......@@ -402,7 +402,7 @@ test "std.PriorityQueue: iterator" {
402402}
403403
404404test "std.PriorityQueue: remove at index" {
405 var queue = PQ.init(debug.global_allocator, lessThan);
405 var queue = PQ.init(testing.allocator, lessThan);
406406 defer queue.deinit();
407407
408408 try queue.add(3);
lib/std/process.zig+4-4
......@@ -114,7 +114,7 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap {
114114}
115115
116116test "os.getEnvMap" {
117 var env = try getEnvMap(std.debug.global_allocator);
117 var env = try getEnvMap(std.testing.allocator);
118118 defer env.deinit();
119119}
120120
......@@ -165,7 +165,7 @@ pub fn getEnvVarOwned(allocator: *mem.Allocator, key: []const u8) GetEnvVarOwned
165165}
166166
167167test "os.getEnvVarOwned" {
168 var ga = std.debug.global_allocator;
168 var ga = std.testing.allocator;
169169 testing.expectError(error.EnvironmentVariableNotFound, getEnvVarOwned(ga, "BADENV"));
170170}
171171
......@@ -492,10 +492,10 @@ test "windows arg parsing" {
492492fn testWindowsCmdLine(input_cmd_line: [*]const u8, expected_args: []const []const u8) void {
493493 var it = ArgIteratorWindows.initWithCmdLine(input_cmd_line);
494494 for (expected_args) |expected_arg| {
495 const arg = it.next(std.debug.global_allocator).? catch unreachable;
495 const arg = it.next(std.testing.allocator).? catch unreachable;
496496 testing.expectEqualSlices(u8, expected_arg, arg);
497497 }
498 testing.expect(it.next(std.debug.global_allocator) == null);
498 testing.expect(it.next(std.testing.allocator) == null);
499499}
500500
501501pub const UserInfo = struct {
lib/std/special/test_runner.zig+1
......@@ -13,6 +13,7 @@ pub fn main() anyerror!void {
1313 };
1414
1515 for (test_fn_list) |test_fn, i| {
16 std.testing.allocator_instance.reset();
1617 var test_node = root_node.start(test_fn.name, null);
1718 test_node.activate();
1819 progress.refresh();
lib/std/testing.zig+5
......@@ -2,6 +2,11 @@ const builtin = @import("builtin");
22const TypeId = builtin.TypeId;
33const std = @import("std.zig");
44
5/// This should only be used in temporary test programs.
6pub const allocator = &allocator_instance.allocator;
7pub var allocator_instance = std.heap.ThreadSafeFixedBufferAllocator.init(allocator_mem[0..]);
8var allocator_mem: [100 * 1024]u8 = undefined;
9
510/// This function is intended to be used only in tests. It prints diagnostics to stderr
611/// and then aborts when actual_error_union is not expected_error.
712pub fn expectError(expected_error: anyerror, actual_error_union: var) void {
lib/std/unicode.zig+6-6
......@@ -501,14 +501,14 @@ test "utf16leToUtf8" {
501501 {
502502 mem.writeIntSliceLittle(u16, utf16le_as_bytes[0..], 'A');
503503 mem.writeIntSliceLittle(u16, utf16le_as_bytes[2..], 'a');
504 const utf8 = try utf16leToUtf8Alloc(std.debug.global_allocator, &utf16le);
504 const utf8 = try utf16leToUtf8Alloc(std.testing.allocator, &utf16le);
505505 testing.expect(mem.eql(u8, utf8, "Aa"));
506506 }
507507
508508 {
509509 mem.writeIntSliceLittle(u16, utf16le_as_bytes[0..], 0x80);
510510 mem.writeIntSliceLittle(u16, utf16le_as_bytes[2..], 0xffff);
511 const utf8 = try utf16leToUtf8Alloc(std.debug.global_allocator, &utf16le);
511 const utf8 = try utf16leToUtf8Alloc(std.testing.allocator, &utf16le);
512512 testing.expect(mem.eql(u8, utf8, "\xc2\x80" ++ "\xef\xbf\xbf"));
513513 }
514514
......@@ -516,7 +516,7 @@ test "utf16leToUtf8" {
516516 // the values just outside the surrogate half range
517517 mem.writeIntSliceLittle(u16, utf16le_as_bytes[0..], 0xd7ff);
518518 mem.writeIntSliceLittle(u16, utf16le_as_bytes[2..], 0xe000);
519 const utf8 = try utf16leToUtf8Alloc(std.debug.global_allocator, &utf16le);
519 const utf8 = try utf16leToUtf8Alloc(std.testing.allocator, &utf16le);
520520 testing.expect(mem.eql(u8, utf8, "\xed\x9f\xbf" ++ "\xee\x80\x80"));
521521 }
522522
......@@ -524,7 +524,7 @@ test "utf16leToUtf8" {
524524 // smallest surrogate pair
525525 mem.writeIntSliceLittle(u16, utf16le_as_bytes[0..], 0xd800);
526526 mem.writeIntSliceLittle(u16, utf16le_as_bytes[2..], 0xdc00);
527 const utf8 = try utf16leToUtf8Alloc(std.debug.global_allocator, &utf16le);
527 const utf8 = try utf16leToUtf8Alloc(std.testing.allocator, &utf16le);
528528 testing.expect(mem.eql(u8, utf8, "\xf0\x90\x80\x80"));
529529 }
530530
......@@ -532,14 +532,14 @@ test "utf16leToUtf8" {
532532 // largest surrogate pair
533533 mem.writeIntSliceLittle(u16, utf16le_as_bytes[0..], 0xdbff);
534534 mem.writeIntSliceLittle(u16, utf16le_as_bytes[2..], 0xdfff);
535 const utf8 = try utf16leToUtf8Alloc(std.debug.global_allocator, &utf16le);
535 const utf8 = try utf16leToUtf8Alloc(std.testing.allocator, &utf16le);
536536 testing.expect(mem.eql(u8, utf8, "\xf4\x8f\xbf\xbf"));
537537 }
538538
539539 {
540540 mem.writeIntSliceLittle(u16, utf16le_as_bytes[0..], 0xdbff);
541541 mem.writeIntSliceLittle(u16, utf16le_as_bytes[2..], 0xdc00);
542 const utf8 = try utf16leToUtf8Alloc(std.debug.global_allocator, &utf16le);
542 const utf8 = try utf16leToUtf8Alloc(std.testing.allocator, &utf16le);
543543 testing.expect(mem.eql(u8, utf8, "\xf4\x8f\xb0\x80"));
544544 }
545545}
lib/std/zig/ast.zig+1-1
......@@ -2287,7 +2287,7 @@ pub const Node = struct {
22872287test "iterate" {
22882288 var root = Node.Root{
22892289 .base = Node{ .id = Node.Id.Root },
2290 .decls = Node.Root.DeclList.init(std.debug.global_allocator),
2290 .decls = Node.Root.DeclList.init(std.testing.allocator),
22912291 .eof_token = 0,
22922292 };
22932293 var base = &root.base;
test/compare_output.zig+2-2
......@@ -445,7 +445,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
445445 \\const std = @import("std");
446446 \\const io = std.io;
447447 \\const os = std.os;
448 \\const allocator = std.debug.global_allocator;
448 \\const allocator = std.testing.allocator;
449449 \\
450450 \\pub fn main() !void {
451451 \\ var args_it = std.process.args();
......@@ -486,7 +486,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
486486 \\const std = @import("std");
487487 \\const io = std.io;
488488 \\const os = std.os;
489 \\const allocator = std.debug.global_allocator;
489 \\const allocator = std.testing.allocator;
490490 \\
491491 \\pub fn main() !void {
492492 \\ var args_it = std.process.args();
test/compile_errors.zig+1-1
......@@ -5765,7 +5765,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
57655765 \\
57665766 \\export fn entry() void {
57675767 \\ const a = MdNode.Header {
5768 \\ .text = MdText.init(&std.debug.global_allocator),
5768 \\ .text = MdText.init(&std.testing.allocator),
57695769 \\ .weight = HeaderWeight.H1,
57705770 \\ };
57715771 \\}
test/stage1/behavior/const_slice_child.zig+1-1
......@@ -22,7 +22,7 @@ fn foo(args: [][]const u8) void {
2222}
2323
2424fn bar(argc: usize) void {
25 const args = debug.global_allocator.alloc([]const u8, argc) catch unreachable;
25 const args = testing.allocator.alloc([]const u8, argc) catch unreachable;
2626 for (args) |_, i| {
2727 const ptr = argv[i];
2828 args[i] = ptr[0..strlen(ptr)];
test/standalone/brace_expansion/main.zig+2-2
......@@ -201,7 +201,7 @@ pub fn main() !void {
201201}
202202
203203test "invalid inputs" {
204 global_allocator = std.debug.global_allocator;
204 global_allocator = std.testing.allocator;
205205
206206 expectError("}ABC", error.InvalidInput);
207207 expectError("{ABC", error.InvalidInput);
......@@ -222,7 +222,7 @@ fn expectError(test_input: []const u8, expected_err: anyerror) void {
222222}
223223
224224test "valid inputs" {
225 global_allocator = std.debug.global_allocator;
225 global_allocator = std.testing.allocator;
226226
227227 expectExpansion("{x,y,z}", "x y z");
228228 expectExpansion("{A,B}{x,y}", "Ax Ay Bx By");
test/standalone/cat/main.zig+1-1
......@@ -4,7 +4,7 @@ const process = std.process;
44const fs = std.fs;
55const mem = std.mem;
66const warn = std.debug.warn;
7const allocator = std.debug.global_allocator;
7const allocator = std.testing.allocator;
88
99pub fn main() !void {
1010 var args_it = process.args();
test/standalone/empty_env/main.zig+1-1
......@@ -1,6 +1,6 @@
11const std = @import("std");
22
33pub fn main() void {
4 const env_map = std.process.getEnvMap(std.debug.global_allocator) catch @panic("unable to get env map");
4 const env_map = std.process.getEnvMap(std.testing.allocator) catch @panic("unable to get env map");
55 std.testing.expect(env_map.count() == 0);
66}
test/standalone/load_dynamic_library/main.zig+2-2
......@@ -1,8 +1,8 @@
11const std = @import("std");
22
33pub fn main() !void {
4 const args = try std.process.argsAlloc(std.debug.global_allocator);
5 defer std.process.argsFree(std.debug.global_allocator, args);
4 const args = try std.process.argsAlloc(std.testing.allocator);
5 defer std.process.argsFree(std.testing.allocator, args);
66
77 const dynlib_name = args[1];
88