Commit 6d44c0a16c90a13cb3507751e2015edf51c642cf | zig

author	Veikka Tuominen <git@vexu.eu> 2022-06-03 16:02:23+03:00
committer	Veikka Tuominen <git@vexu.eu> 2022-06-03 20:21:20+03:00
log	6d44c0a16c90a13cb3507751e2015edf51c642cf
tree	6dfa9b43c776a3a34fad7aedada8b76b5eac5ac2
parent	1a7b4ddeaedb81255cfa8907958c3cf09dd340ee

std: update tests to stage2 semantics

11 files changed, 262 insertions(+), 144 deletions(-)

lib
- std
  - crypto
    25519
    scalar.zig
    blake3.zig
    sha3.zig
  - fmt.zig
  - heap.zig
  - heap
    log_to_writer_allocator.zig
  - io
    reader.zig
  - json.zig
  - meta.zig
  - net.zig
  - zig
    c_translation.zig

lib/std/crypto/25519/scalar.zig+8-4

...	...	@@ -34,12 +34,14 @@ pub fn rejectNonCanonical(s: CompressedScalar) NonCanonicalError!void {
34	34
35	35	/// Reduce a scalar to the field size.
36	36	pub fn reduce(s: CompressedScalar) CompressedScalar {
37		return Scalar.fromBytes(s).toBytes();
	37	var scalar = Scalar.fromBytes(s);
	38	return scalar.toBytes();
38	39	}
39	40
40	41	/// Reduce a 64-bytes scalar to the field size.
41	42	pub fn reduce64(s: [64]u8) CompressedScalar {
42		return ScalarDouble.fromBytes64(s).toBytes();
	43	var scalar = ScalarDouble.fromBytes64(s);
	44	return scalar.toBytes();
43	45	}
44	46
45	47	/// Perform the X25519 "clamping" operation.
...	...	@@ -106,12 +108,14 @@ pub const Scalar = struct {
106	108
107	109	/// Unpack a 32-byte representation of a scalar
108	110	pub fn fromBytes(bytes: CompressedScalar) Scalar {
109		return ScalarDouble.fromBytes32(bytes).reduce(5);
	111	var scalar = ScalarDouble.fromBytes32(bytes);
	112	return scalar.reduce(5);
110	113	}
111	114
112	115	/// Unpack a 64-byte representation of a scalar
113	116	pub fn fromBytes64(bytes: [64]u8) Scalar {
114		return ScalarDouble.fromBytes64(bytes).reduce(5);
	117	var scalar = ScalarDouble.fromBytes64(bytes);
	118	return scalar.reduce(5);
115	119	}
116	120
117	121	/// Pack a scalar into bytes

lib/std/crypto/blake3.zig+6-3

...	...	@@ -679,9 +679,12 @@ fn testBlake3(hasher: *Blake3, input_len: usize, expected_hex: [262]u8) !void {
679	679	}
680	680
681	681	test "BLAKE3 reference test cases" {
682		var hash = &Blake3.init(.{});
683		var keyed_hash = &Blake3.init(.{ .key = reference_test.key.* });
684		var derive_key = &Blake3.initKdf(reference_test.context_string, .{});
	682	var hash_state = Blake3.init(.{});
	683	const hash = &hash_state;
	684	var keyed_hash_state = Blake3.init(.{ .key = reference_test.key.* });
	685	const keyed_hash = &keyed_hash_state;
	686	var derive_key_state = Blake3.initKdf(reference_test.context_string, .{});
	687	const derive_key = &derive_key_state;
685	688
686	689	for (reference_test.cases) \|t\| {
687	690	try testBlake3(hash, t.input_len, t.hash.*);

lib/std/crypto/sha3.zig+3-5

...	...	@@ -128,18 +128,16 @@ fn keccakF(comptime F: usize, d: *[F / 8]u8) void {
128	128	r.* = mem.readIntLittle(u64, d[8 * i ..][0..8]);
129	129	}
130	130
131		comptime var x: usize = 0;
132		comptime var y: usize = 0;
133	131	for (RC[0..no_rounds]) \|round\| {
134	132	// theta
135		x = 0;
	133	comptime var x: usize = 0;
136	134	inline while (x < 5) : (x += 1) {
137	135	c[x] = s[x] ^ s[x + 5] ^ s[x + 10] ^ s[x + 15] ^ s[x + 20];
138	136	}
139	137	x = 0;
140	138	inline while (x < 5) : (x += 1) {
141	139	t[0] = c[M5[x + 4]] ^ math.rotl(u64, c[M5[x + 1]], @as(usize, 1));
142		y = 0;
	140	comptime var y: usize = 0;
143	141	inline while (y < 5) : (y += 1) {
144	142	s[x + y * 5] ^= t[0];
145	143	}
...	...	@@ -155,7 +153,7 @@ fn keccakF(comptime F: usize, d: *[F / 8]u8) void {
155	153	}
156	154
157	155	// chi
158		y = 0;
	156	comptime var y: usize = 0;
159	157	inline while (y < 5) : (y += 1) {
160	158	x = 0;
161	159	inline while (x < 5) : (x += 1) {

lib/std/fmt.zig+1

...	...	@@ -2123,6 +2123,7 @@ test "pointer" {
2123	2123	try expectFmt("pointer: i32@deadbeef\n", "pointer: {}\n", .{value});
2124	2124	try expectFmt("pointer: i32@deadbeef\n", "pointer: {*}\n", .{value});
2125	2125	}
	2126	if (builtin.zig_backend != .stage1) return error.SkipZigTest;
2126	2127	{
2127	2128	const value = @intToPtr(fn () void, 0xdeadbeef);
2128	2129	try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});

lib/std/heap.zig+2-1

...	...	@@ -1210,7 +1210,8 @@ pub fn testAllocatorAlignedShrink(base_allocator: mem.Allocator) !void {
1210	1210	const allocator = validationAllocator.allocator();
1211	1211
1212	1212	var debug_buffer: [1000]u8 = undefined;
1213		const debug_allocator = FixedBufferAllocator.init(&debug_buffer).allocator();
	1213	var fib = FixedBufferAllocator.init(&debug_buffer);
	1214	const debug_allocator = fib.allocator();
1214	1215
1215	1216	const alloc_size = mem.page_size * 2 + 50;
1216	1217	var slice = try allocator.alignedAlloc(u8, 16, alloc_size);

lib/std/heap/log_to_writer_allocator.zig+2-1

...	...	@@ -91,7 +91,8 @@ test "LogToWriterAllocator" {
91	91
92	92	var allocator_buf: [10]u8 = undefined;
93	93	var fixedBufferAllocator = std.mem.validationWrap(std.heap.FixedBufferAllocator.init(&allocator_buf));
94		const allocator = logToWriterAllocator(fixedBufferAllocator.allocator(), fbs.writer()).allocator();
	94	var allocator_state = logToWriterAllocator(fixedBufferAllocator.allocator(), fbs.writer());
	95	const allocator = allocator_state.allocator();
95	96
96	97	var a = try allocator.alloc(u8, 10);
97	98	a = allocator.shrink(a, 5);

lib/std/io/reader.zig+64-32

...	...	@@ -344,7 +344,8 @@ pub fn Reader(
344	344
345	345	test "Reader" {
346	346	var buf = "a\x02".*;
347		const reader = std.io.fixedBufferStream(&buf).reader();
	347	var fis = std.io.fixedBufferStream(&buf);
	348	const reader = fis.reader();
348	349	try testing.expect((try reader.readByte()) == 'a');
349	350	try testing.expect((try reader.readEnum(enum(u8) {
350	351	a = 0,
...	...	@@ -356,13 +357,15 @@ test "Reader" {
356	357	}
357	358
358	359	test "Reader.isBytes" {
359		const reader = std.io.fixedBufferStream("foobar").reader();
	360	var fis = std.io.fixedBufferStream("foobar");
	361	const reader = fis.reader();
360	362	try testing.expectEqual(true, try reader.isBytes("foo"));
361	363	try testing.expectEqual(false, try reader.isBytes("qux"));
362	364	}
363	365
364	366	test "Reader.skipBytes" {
365		const reader = std.io.fixedBufferStream("foobar").reader();
	367	var fis = std.io.fixedBufferStream("foobar");
	368	const reader = fis.reader();
366	369	try reader.skipBytes(3, .{});
367	370	try testing.expect(try reader.isBytes("bar"));
368	371	try reader.skipBytes(0, .{});
...	...	@@ -374,7 +377,8 @@ test "Reader.readUntilDelimiterArrayList returns ArrayLists with bytes read unti
374	377	var list = std.ArrayList(u8).init(a);
375	378	defer list.deinit();
376	379
377		const reader = std.io.fixedBufferStream("0000\n1234\n").reader();
	380	var fis = std.io.fixedBufferStream("0000\n1234\n");
	381	const reader = fis.reader();
378	382
379	383	try reader.readUntilDelimiterArrayList(&list, '\n', 5);
380	384	try std.testing.expectEqualStrings("0000", list.items);
...	...	@@ -388,7 +392,8 @@ test "Reader.readUntilDelimiterArrayList returns an empty ArrayList" {
388	392	var list = std.ArrayList(u8).init(a);
389	393	defer list.deinit();
390	394
391		const reader = std.io.fixedBufferStream("\n").reader();
	395	var fis = std.io.fixedBufferStream("\n");
	396	const reader = fis.reader();
392	397
393	398	try reader.readUntilDelimiterArrayList(&list, '\n', 5);
394	399	try std.testing.expectEqualStrings("", list.items);
...	...	@@ -399,7 +404,8 @@ test "Reader.readUntilDelimiterArrayList returns StreamTooLong, then an ArrayLis
399	404	var list = std.ArrayList(u8).init(a);
400	405	defer list.deinit();
401	406
402		const reader = std.io.fixedBufferStream("1234567\n").reader();
	407	var fis = std.io.fixedBufferStream("1234567\n");
	408	const reader = fis.reader();
403	409
404	410	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterArrayList(&list, '\n', 5));
405	411	try std.testing.expectEqualStrings("12345", list.items);
...	...	@@ -412,7 +418,8 @@ test "Reader.readUntilDelimiterArrayList returns EndOfStream" {
412	418	var list = std.ArrayList(u8).init(a);
413	419	defer list.deinit();
414	420
415		const reader = std.io.fixedBufferStream("1234").reader();
	421	var fis = std.io.fixedBufferStream("1234");
	422	const reader = fis.reader();
416	423
417	424	try std.testing.expectError(error.EndOfStream, reader.readUntilDelimiterArrayList(&list, '\n', 5));
418	425	try std.testing.expectEqualStrings("1234", list.items);
...	...	@@ -421,7 +428,8 @@ test "Reader.readUntilDelimiterArrayList returns EndOfStream" {
421	428	test "Reader.readUntilDelimiterAlloc returns ArrayLists with bytes read until the delimiter, then EndOfStream" {
422	429	const a = std.testing.allocator;
423	430
424		const reader = std.io.fixedBufferStream("0000\n1234\n").reader();
	431	var fis = std.io.fixedBufferStream("0000\n1234\n");
	432	const reader = fis.reader();
425	433
426	434	{
427	435	var result = try reader.readUntilDelimiterAlloc(a, '\n', 5);
...	...	@@ -441,7 +449,8 @@ test "Reader.readUntilDelimiterAlloc returns ArrayLists with bytes read until th
441	449	test "Reader.readUntilDelimiterAlloc returns an empty ArrayList" {
442	450	const a = std.testing.allocator;
443	451
444		const reader = std.io.fixedBufferStream("\n").reader();
	452	var fis = std.io.fixedBufferStream("\n");
	453	const reader = fis.reader();
445	454
446	455	{
447	456	var result = try reader.readUntilDelimiterAlloc(a, '\n', 5);
...	...	@@ -453,7 +462,8 @@ test "Reader.readUntilDelimiterAlloc returns an empty ArrayList" {
453	462	test "Reader.readUntilDelimiterAlloc returns StreamTooLong, then an ArrayList with bytes read until the delimiter" {
454	463	const a = std.testing.allocator;
455	464
456		const reader = std.io.fixedBufferStream("1234567\n").reader();
	465	var fis = std.io.fixedBufferStream("1234567\n");
	466	const reader = fis.reader();
457	467
458	468	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterAlloc(a, '\n', 5));
459	469
...	...	@@ -465,67 +475,77 @@ test "Reader.readUntilDelimiterAlloc returns StreamTooLong, then an ArrayList wi
465	475	test "Reader.readUntilDelimiterAlloc returns EndOfStream" {
466	476	const a = std.testing.allocator;
467	477
468		const reader = std.io.fixedBufferStream("1234").reader();
	478	var fis = std.io.fixedBufferStream("1234");
	479	const reader = fis.reader();
469	480
470	481	try std.testing.expectError(error.EndOfStream, reader.readUntilDelimiterAlloc(a, '\n', 5));
471	482	}
472	483
473	484	test "Reader.readUntilDelimiter returns bytes read until the delimiter" {
474	485	var buf: [5]u8 = undefined;
475		const reader = std.io.fixedBufferStream("0000\n1234\n").reader();
	486	var fis = std.io.fixedBufferStream("0000\n1234\n");
	487	const reader = fis.reader();
476	488	try std.testing.expectEqualStrings("0000", try reader.readUntilDelimiter(&buf, '\n'));
477	489	try std.testing.expectEqualStrings("1234", try reader.readUntilDelimiter(&buf, '\n'));
478	490	}
479	491
480	492	test "Reader.readUntilDelimiter returns an empty string" {
481	493	var buf: [5]u8 = undefined;
482		const reader = std.io.fixedBufferStream("\n").reader();
	494	var fis = std.io.fixedBufferStream("\n");
	495	const reader = fis.reader();
483	496	try std.testing.expectEqualStrings("", try reader.readUntilDelimiter(&buf, '\n'));
484	497	}
485	498
486	499	test "Reader.readUntilDelimiter returns StreamTooLong, then an empty string" {
487	500	var buf: [5]u8 = undefined;
488		const reader = std.io.fixedBufferStream("12345\n").reader();
	501	var fis = std.io.fixedBufferStream("12345\n");
	502	const reader = fis.reader();
489	503	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiter(&buf, '\n'));
490	504	try std.testing.expectEqualStrings("", try reader.readUntilDelimiter(&buf, '\n'));
491	505	}
492	506
493	507	test "Reader.readUntilDelimiter returns StreamTooLong, then bytes read until the delimiter" {
494	508	var buf: [5]u8 = undefined;
495		const reader = std.io.fixedBufferStream("1234567\n").reader();
	509	var fis = std.io.fixedBufferStream("1234567\n");
	510	const reader = fis.reader();
496	511	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiter(&buf, '\n'));
497	512	try std.testing.expectEqualStrings("67", try reader.readUntilDelimiter(&buf, '\n'));
498	513	}
499	514
500	515	test "Reader.readUntilDelimiter returns EndOfStream" {
501	516	var buf: [5]u8 = undefined;
502		const reader = std.io.fixedBufferStream("").reader();
	517	var fis = std.io.fixedBufferStream("");
	518	const reader = fis.reader();
503	519	try std.testing.expectError(error.EndOfStream, reader.readUntilDelimiter(&buf, '\n'));
504	520	}
505	521
506	522	test "Reader.readUntilDelimiter returns bytes read until delimiter, then EndOfStream" {
507	523	var buf: [5]u8 = undefined;
508		const reader = std.io.fixedBufferStream("1234\n").reader();
	524	var fis = std.io.fixedBufferStream("1234\n");
	525	const reader = fis.reader();
509	526	try std.testing.expectEqualStrings("1234", try reader.readUntilDelimiter(&buf, '\n'));
510	527	try std.testing.expectError(error.EndOfStream, reader.readUntilDelimiter(&buf, '\n'));
511	528	}
512	529
513	530	test "Reader.readUntilDelimiter returns EndOfStream" {
514	531	var buf: [5]u8 = undefined;
515		const reader = std.io.fixedBufferStream("1234").reader();
	532	var fis = std.io.fixedBufferStream("1234");
	533	const reader = fis.reader();
516	534	try std.testing.expectError(error.EndOfStream, reader.readUntilDelimiter(&buf, '\n'));
517	535	}
518	536
519	537	test "Reader.readUntilDelimiter returns StreamTooLong, then EndOfStream" {
520	538	var buf: [5]u8 = undefined;
521		const reader = std.io.fixedBufferStream("12345").reader();
	539	var fis = std.io.fixedBufferStream("12345");
	540	const reader = fis.reader();
522	541	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiter(&buf, '\n'));
523	542	try std.testing.expectError(error.EndOfStream, reader.readUntilDelimiter(&buf, '\n'));
524	543	}
525	544
526	545	test "Reader.readUntilDelimiter writes all bytes read to the output buffer" {
527	546	var buf: [5]u8 = undefined;
528		const reader = std.io.fixedBufferStream("0000\n12345").reader();
	547	var fis = std.io.fixedBufferStream("0000\n12345");
	548	const reader = fis.reader();
529	549	_ = try reader.readUntilDelimiter(&buf, '\n');
530	550	try std.testing.expectEqualStrings("0000\n", &buf);
531	551	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiter(&buf, '\n'));
...	...	@@ -535,7 +555,8 @@ test "Reader.readUntilDelimiter writes all bytes read to the output buffer" {
535	555	test "Reader.readUntilDelimiterOrEofAlloc returns ArrayLists with bytes read until the delimiter, then EndOfStream" {
536	556	const a = std.testing.allocator;
537	557
538		const reader = std.io.fixedBufferStream("0000\n1234\n").reader();
	558	var fis = std.io.fixedBufferStream("0000\n1234\n");
	559	const reader = fis.reader();
539	560
540	561	{
541	562	var result = (try reader.readUntilDelimiterOrEofAlloc(a, '\n', 5)).?;
...	...	@@ -555,7 +576,8 @@ test "Reader.readUntilDelimiterOrEofAlloc returns ArrayLists with bytes read unt
555	576	test "Reader.readUntilDelimiterOrEofAlloc returns an empty ArrayList" {
556	577	const a = std.testing.allocator;
557	578
558		const reader = std.io.fixedBufferStream("\n").reader();
	579	var fis = std.io.fixedBufferStream("\n");
	580	const reader = fis.reader();
559	581
560	582	{
561	583	var result = (try reader.readUntilDelimiterOrEofAlloc(a, '\n', 5)).?;
...	...	@@ -567,7 +589,8 @@ test "Reader.readUntilDelimiterOrEofAlloc returns an empty ArrayList" {
567	589	test "Reader.readUntilDelimiterOrEofAlloc returns StreamTooLong, then an ArrayList with bytes read until the delimiter" {
568	590	const a = std.testing.allocator;
569	591
570		const reader = std.io.fixedBufferStream("1234567\n").reader();
	592	var fis = std.io.fixedBufferStream("1234567\n");
	593	const reader = fis.reader();
571	594
572	595	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterOrEofAlloc(a, '\n', 5));
573	596
...	...	@@ -578,60 +601,69 @@ test "Reader.readUntilDelimiterOrEofAlloc returns StreamTooLong, then an ArrayLi
578	601
579	602	test "Reader.readUntilDelimiterOrEof returns bytes read until the delimiter" {
580	603	var buf: [5]u8 = undefined;
581		const reader = std.io.fixedBufferStream("0000\n1234\n").reader();
	604	var fis = std.io.fixedBufferStream("0000\n1234\n");
	605	const reader = fis.reader();
582	606	try std.testing.expectEqualStrings("0000", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
583	607	try std.testing.expectEqualStrings("1234", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
584	608	}
585	609
586	610	test "Reader.readUntilDelimiterOrEof returns an empty string" {
587	611	var buf: [5]u8 = undefined;
588		const reader = std.io.fixedBufferStream("\n").reader();
	612	var fis = std.io.fixedBufferStream("\n");
	613	const reader = fis.reader();
589	614	try std.testing.expectEqualStrings("", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
590	615	}
591	616
592	617	test "Reader.readUntilDelimiterOrEof returns StreamTooLong, then an empty string" {
593	618	var buf: [5]u8 = undefined;
594		const reader = std.io.fixedBufferStream("12345\n").reader();
	619	var fis = std.io.fixedBufferStream("12345\n");
	620	const reader = fis.reader();
595	621	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterOrEof(&buf, '\n'));
596	622	try std.testing.expectEqualStrings("", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
597	623	}
598	624
599	625	test "Reader.readUntilDelimiterOrEof returns StreamTooLong, then bytes read until the delimiter" {
600	626	var buf: [5]u8 = undefined;
601		const reader = std.io.fixedBufferStream("1234567\n").reader();
	627	var fis = std.io.fixedBufferStream("1234567\n");
	628	const reader = fis.reader();
602	629	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterOrEof(&buf, '\n'));
603	630	try std.testing.expectEqualStrings("67", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
604	631	}
605	632
606	633	test "Reader.readUntilDelimiterOrEof returns null" {
607	634	var buf: [5]u8 = undefined;
608		const reader = std.io.fixedBufferStream("").reader();
	635	var fis = std.io.fixedBufferStream("");
	636	const reader = fis.reader();
609	637	try std.testing.expect((try reader.readUntilDelimiterOrEof(&buf, '\n')) == null);
610	638	}
611	639
612	640	test "Reader.readUntilDelimiterOrEof returns bytes read until delimiter, then null" {
613	641	var buf: [5]u8 = undefined;
614		const reader = std.io.fixedBufferStream("1234\n").reader();
	642	var fis = std.io.fixedBufferStream("1234\n");
	643	const reader = fis.reader();
615	644	try std.testing.expectEqualStrings("1234", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
616	645	try std.testing.expect((try reader.readUntilDelimiterOrEof(&buf, '\n')) == null);
617	646	}
618	647
619	648	test "Reader.readUntilDelimiterOrEof returns bytes read until end-of-stream" {
620	649	var buf: [5]u8 = undefined;
621		const reader = std.io.fixedBufferStream("1234").reader();
	650	var fis = std.io.fixedBufferStream("1234");
	651	const reader = fis.reader();
622	652	try std.testing.expectEqualStrings("1234", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
623	653	}
624	654
625	655	test "Reader.readUntilDelimiterOrEof returns StreamTooLong, then bytes read until end-of-stream" {
626	656	var buf: [5]u8 = undefined;
627		const reader = std.io.fixedBufferStream("1234567").reader();
	657	var fis = std.io.fixedBufferStream("1234567");
	658	const reader = fis.reader();
628	659	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterOrEof(&buf, '\n'));
629	660	try std.testing.expectEqualStrings("67", (try reader.readUntilDelimiterOrEof(&buf, '\n')).?);
630	661	}
631	662
632	663	test "Reader.readUntilDelimiterOrEof writes all bytes read to the output buffer" {
633	664	var buf: [5]u8 = undefined;
634		const reader = std.io.fixedBufferStream("0000\n12345").reader();
	665	var fis = std.io.fixedBufferStream("0000\n12345");
	666	const reader = fis.reader();
635	667	_ = try reader.readUntilDelimiterOrEof(&buf, '\n');
636	668	try std.testing.expectEqualStrings("0000\n", &buf);
637	669	try std.testing.expectError(error.StreamTooLong, reader.readUntilDelimiterOrEof(&buf, '\n'));

lib/std/json.zig+136-85

...	...	@@ -1506,42 +1506,46 @@ fn skipValue(tokens: *TokenStream) SkipValueError!void {
1506	1506	}
1507	1507
1508	1508	test "skipValue" {
1509		try skipValue(&TokenStream.init("false"));
1510		try skipValue(&TokenStream.init("true"));
1511		try skipValue(&TokenStream.init("null"));
1512		try skipValue(&TokenStream.init("42"));
1513		try skipValue(&TokenStream.init("42.0"));
1514		try skipValue(&TokenStream.init("\"foo\""));
1515		try skipValue(&TokenStream.init("[101, 111, 121]"));
1516		try skipValue(&TokenStream.init("{}"));
1517		try skipValue(&TokenStream.init("{\"foo\": \"bar\"}"));
	1509	var ts = TokenStream.init("false");
	1510	try skipValue(&ts);
	1511	ts = TokenStream.init("true");
	1512	try skipValue(&ts);
	1513	ts = TokenStream.init("null");
	1514	try skipValue(&ts);
	1515	ts = TokenStream.init("42");
	1516	try skipValue(&ts);
	1517	ts = TokenStream.init("42.0");
	1518	try skipValue(&ts);
	1519	ts = TokenStream.init("\"foo\"");
	1520	try skipValue(&ts);
	1521	ts = TokenStream.init("[101, 111, 121]");
	1522	try skipValue(&ts);
	1523	ts = TokenStream.init("{}");
	1524	try skipValue(&ts);
	1525	ts = TokenStream.init("{\"foo\": \"bar\"}");
	1526	try skipValue(&ts);
1518	1527
1519	1528	{ // An absurd number of nestings
1520	1529	const nestings = StreamingParser.default_max_nestings + 1;
1521	1530
1522		try testing.expectError(
1523		error.TooManyNestedItems,
1524		skipValue(&TokenStream.init("[" nestings ++ "]" nestings)),
1525		);
	1531	ts = TokenStream.init("[" nestings ++ "]" nestings);
	1532	try testing.expectError(error.TooManyNestedItems, skipValue(&ts));
1526	1533	}
1527	1534
1528	1535	{ // Would a number token cause problems in a deeply-nested array?
1529	1536	const nestings = StreamingParser.default_max_nestings;
1530	1537	const deeply_nested_array = "[" nestings ++ "0.118, 999, 881.99, 911.9, 725, 3" ++ "]" nestings;
1531	1538
1532		try skipValue(&TokenStream.init(deeply_nested_array));
	1539	ts = TokenStream.init(deeply_nested_array);
	1540	try skipValue(&ts);
1533	1541
1534		try testing.expectError(
1535		error.TooManyNestedItems,
1536		skipValue(&TokenStream.init("[" ++ deeply_nested_array ++ "]")),
1537		);
	1542	ts = TokenStream.init("[" ++ deeply_nested_array ++ "]");
	1543	try testing.expectError(error.TooManyNestedItems, skipValue(&ts));
1538	1544	}
1539	1545
1540	1546	// Mismatched brace/square bracket
1541		try testing.expectError(
1542		error.UnexpectedClosingBrace,
1543		skipValue(&TokenStream.init("[102, 111, 111}")),
1544		);
	1547	ts = TokenStream.init("[102, 111, 111}");
	1548	try testing.expectError(error.UnexpectedClosingBrace, skipValue(&ts));
1545	1549
1546	1550	{ // should fail if no value found (e.g. immediate close of object)
1547	1551	var empty_object = TokenStream.init("{}");
...	...	@@ -1980,18 +1984,29 @@ pub fn parseFree(comptime T: type, value: T, options: ParseOptions) void {
1980	1984	}
1981	1985
1982	1986	test "parse" {
1983		try testing.expectEqual(false, try parse(bool, &TokenStream.init("false"), ParseOptions{}));
1984		try testing.expectEqual(true, try parse(bool, &TokenStream.init("true"), ParseOptions{}));
1985		try testing.expectEqual(@as(u1, 1), try parse(u1, &TokenStream.init("1"), ParseOptions{}));
1986		try testing.expectError(error.Overflow, parse(u1, &TokenStream.init("50"), ParseOptions{}));
1987		try testing.expectEqual(@as(u64, 42), try parse(u64, &TokenStream.init("42"), ParseOptions{}));
1988		try testing.expectEqual(@as(f64, 42), try parse(f64, &TokenStream.init("42.0"), ParseOptions{}));
1989		try testing.expectEqual(@as(?bool, null), try parse(?bool, &TokenStream.init("null"), ParseOptions{}));
1990		try testing.expectEqual(@as(?bool, true), try parse(?bool, &TokenStream.init("true"), ParseOptions{}));
1991
1992		try testing.expectEqual(@as([3]u8, "foo".*), try parse([3]u8, &TokenStream.init("\"foo\""), ParseOptions{}));
1993		try testing.expectEqual(@as([3]u8, "foo".*), try parse([3]u8, &TokenStream.init("[102, 111, 111]"), ParseOptions{}));
1994		try testing.expectEqual(@as([0]u8, undefined), try parse([0]u8, &TokenStream.init("[]"), ParseOptions{}));
	1987	var ts = TokenStream.init("false");
	1988	try testing.expectEqual(false, try parse(bool, &ts, ParseOptions{}));
	1989	ts = TokenStream.init("true");
	1990	try testing.expectEqual(true, try parse(bool, &ts, ParseOptions{}));
	1991	ts = TokenStream.init("1");
	1992	try testing.expectEqual(@as(u1, 1), try parse(u1, &ts, ParseOptions{}));
	1993	ts = TokenStream.init("50");
	1994	try testing.expectError(error.Overflow, parse(u1, &ts, ParseOptions{}));
	1995	ts = TokenStream.init("42");
	1996	try testing.expectEqual(@as(u64, 42), try parse(u64, &ts, ParseOptions{}));
	1997	ts = TokenStream.init("42.0");
	1998	try testing.expectEqual(@as(f64, 42), try parse(f64, &ts, ParseOptions{}));
	1999	ts = TokenStream.init("null");
	2000	try testing.expectEqual(@as(?bool, null), try parse(?bool, &ts, ParseOptions{}));
	2001	ts = TokenStream.init("true");
	2002	try testing.expectEqual(@as(?bool, true), try parse(?bool, &ts, ParseOptions{}));
	2003
	2004	ts = TokenStream.init("\"foo\"");
	2005	try testing.expectEqual(@as([3]u8, "foo".*), try parse([3]u8, &ts, ParseOptions{}));
	2006	ts = TokenStream.init("[102, 111, 111]");
	2007	try testing.expectEqual(@as([3]u8, "foo".*), try parse([3]u8, &ts, ParseOptions{}));
	2008	ts = TokenStream.init("[]");
	2009	try testing.expectEqual(@as([0]u8, undefined), try parse([0]u8, &ts, ParseOptions{}));
1995	2010	}
1996	2011
1997	2012	test "parse into enum" {
...	...	@@ -2000,36 +2015,48 @@ test "parse into enum" {
2000	2015	Bar,
2001	2016	@"with\\escape",
2002	2017	};
2003		try testing.expectEqual(@as(T, .Foo), try parse(T, &TokenStream.init("\"Foo\""), ParseOptions{}));
2004		try testing.expectEqual(@as(T, .Foo), try parse(T, &TokenStream.init("42"), ParseOptions{}));
2005		try testing.expectEqual(@as(T, .@"with\\escape"), try parse(T, &TokenStream.init("\"with\\\\escape\""), ParseOptions{}));
2006		try testing.expectError(error.InvalidEnumTag, parse(T, &TokenStream.init("5"), ParseOptions{}));
2007		try testing.expectError(error.InvalidEnumTag, parse(T, &TokenStream.init("\"Qux\""), ParseOptions{}));
	2018	var ts = TokenStream.init("\"Foo\"");
	2019	try testing.expectEqual(@as(T, .Foo), try parse(T, &ts, ParseOptions{}));
	2020	ts = TokenStream.init("42");
	2021	try testing.expectEqual(@as(T, .Foo), try parse(T, &ts, ParseOptions{}));
	2022	ts = TokenStream.init("\"with\\\\escape\"");
	2023	try testing.expectEqual(@as(T, .@"with\\escape"), try parse(T, &ts, ParseOptions{}));
	2024	ts = TokenStream.init("5");
	2025	try testing.expectError(error.InvalidEnumTag, parse(T, &ts, ParseOptions{}));
	2026	ts = TokenStream.init("\"Qux\"");
	2027	try testing.expectError(error.InvalidEnumTag, parse(T, &ts, ParseOptions{}));
2008	2028	}
2009	2029
2010	2030	test "parse with trailing data" {
2011		try testing.expectEqual(false, try parse(bool, &TokenStream.init("falsed"), ParseOptions{ .allow_trailing_data = true }));
2012		try testing.expectError(error.InvalidTopLevelTrailing, parse(bool, &TokenStream.init("falsed"), ParseOptions{ .allow_trailing_data = false }));
	2031	var ts = TokenStream.init("falsed");
	2032	try testing.expectEqual(false, try parse(bool, &ts, ParseOptions{ .allow_trailing_data = true }));
	2033	ts = TokenStream.init("falsed");
	2034	try testing.expectError(error.InvalidTopLevelTrailing, parse(bool, &ts, ParseOptions{ .allow_trailing_data = false }));
2013	2035	// trailing whitespace is okay
2014		try testing.expectEqual(false, try parse(bool, &TokenStream.init("false \n"), ParseOptions{ .allow_trailing_data = false }));
	2036	ts = TokenStream.init("false \n");
	2037	try testing.expectEqual(false, try parse(bool, &ts, ParseOptions{ .allow_trailing_data = false }));
2015	2038	}
2016	2039
2017	2040	test "parse into that allocates a slice" {
2018		try testing.expectError(error.AllocatorRequired, parse([]u8, &TokenStream.init("\"foo\""), ParseOptions{}));
	2041	var ts = TokenStream.init("\"foo\"");
	2042	try testing.expectError(error.AllocatorRequired, parse([]u8, &ts, ParseOptions{}));
2019	2043
2020	2044	const options = ParseOptions{ .allocator = testing.allocator };
2021	2045	{
2022		const r = try parse([]u8, &TokenStream.init("\"foo\""), options);
	2046	ts = TokenStream.init("\"foo\"");
	2047	const r = try parse([]u8, &ts, options);
2023	2048	defer parseFree([]u8, r, options);
2024	2049	try testing.expectEqualSlices(u8, "foo", r);
2025	2050	}
2026	2051	{
2027		const r = try parse([]u8, &TokenStream.init("[102, 111, 111]"), options);
	2052	ts = TokenStream.init("[102, 111, 111]");
	2053	const r = try parse([]u8, &ts, options);
2028	2054	defer parseFree([]u8, r, options);
2029	2055	try testing.expectEqualSlices(u8, "foo", r);
2030	2056	}
2031	2057	{
2032		const r = try parse([]u8, &TokenStream.init("\"with\\\\escape\""), options);
	2058	ts = TokenStream.init("\"with\\\\escape\"");
	2059	const r = try parse([]u8, &ts, options);
2033	2060	defer parseFree([]u8, r, options);
2034	2061	try testing.expectEqualSlices(u8, "with\\escape", r);
2035	2062	}
...	...	@@ -2042,7 +2069,8 @@ test "parse into tagged union" {
2042	2069	float: f64,
2043	2070	string: []const u8,
2044	2071	};
2045		try testing.expectEqual(T{ .float = 1.5 }, try parse(T, &TokenStream.init("1.5"), ParseOptions{}));
	2072	var ts = TokenStream.init("1.5");
	2073	try testing.expectEqual(T{ .float = 1.5 }, try parse(T, &ts, ParseOptions{}));
2046	2074	}
2047	2075
2048	2076	{ // failing allocations should be bubbled up instantly without trying next member
...	...	@@ -2053,7 +2081,8 @@ test "parse into tagged union" {
2053	2081	string: []const u8,
2054	2082	array: [3]u8,
2055	2083	};
2056		try testing.expectError(error.OutOfMemory, parse(T, &TokenStream.init("[1,2,3]"), options));
	2084	var ts = TokenStream.init("[1,2,3]");
	2085	try testing.expectError(error.OutOfMemory, parse(T, &ts, options));
2057	2086	}
2058	2087
2059	2088	{
...	...	@@ -2062,7 +2091,8 @@ test "parse into tagged union" {
2062	2091	x: u8,
2063	2092	y: u8,
2064	2093	};
2065		try testing.expectEqual(T{ .x = 42 }, try parse(T, &TokenStream.init("42"), ParseOptions{}));
	2094	var ts = TokenStream.init("42");
	2095	try testing.expectEqual(T{ .x = 42 }, try parse(T, &ts, ParseOptions{}));
2066	2096	}
2067	2097
2068	2098	{ // needs to back out when first union member doesn't match
...	...	@@ -2070,7 +2100,8 @@ test "parse into tagged union" {
2070	2100	A: struct { x: u32 },
2071	2101	B: struct { y: u32 },
2072	2102	};
2073		try testing.expectEqual(T{ .B = .{ .y = 42 } }, try parse(T, &TokenStream.init("{\"y\":42}"), ParseOptions{}));
	2103	var ts = TokenStream.init("{\"y\":42}");
	2104	try testing.expectEqual(T{ .B = .{ .y = 42 } }, try parse(T, &ts, ParseOptions{}));
2074	2105	}
2075	2106	}
2076	2107
...	...	@@ -2080,7 +2111,8 @@ test "parse union bubbles up AllocatorRequired" {
2080	2111	string: []const u8,
2081	2112	int: i32,
2082	2113	};
2083		try testing.expectError(error.AllocatorRequired, parse(T, &TokenStream.init("42"), ParseOptions{}));
	2114	var ts = TokenStream.init("42");
	2115	try testing.expectError(error.AllocatorRequired, parse(T, &ts, ParseOptions{}));
2084	2116	}
2085	2117
2086	2118	{ // string member not first in union (and matching)
...	...	@@ -2089,7 +2121,8 @@ test "parse union bubbles up AllocatorRequired" {
2089	2121	float: f64,
2090	2122	string: []const u8,
2091	2123	};
2092		try testing.expectError(error.AllocatorRequired, parse(T, &TokenStream.init("\"foo\""), ParseOptions{}));
	2124	var ts = TokenStream.init("\"foo\"");
	2125	try testing.expectError(error.AllocatorRequired, parse(T, &ts, ParseOptions{}));
2093	2126	}
2094	2127	}
2095	2128
...	...	@@ -2102,7 +2135,8 @@ test "parseFree descends into tagged union" {
2102	2135	string: []const u8,
2103	2136	};
2104	2137	// use a string with unicode escape so we know result can't be a reference to global constant
2105		const r = try parse(T, &TokenStream.init("\"with\\u0105unicode\""), options);
	2138	var ts = TokenStream.init("\"with\\u0105unicode\"");
	2139	const r = try parse(T, &ts, options);
2106	2140	try testing.expectEqual(std.meta.Tag(T).string, @as(std.meta.Tag(T), r));
2107	2141	try testing.expectEqualSlices(u8, "withąunicode", r.string);
2108	2142	try testing.expectEqual(@as(usize, 0), fail_alloc.deallocations);
...	...	@@ -2116,12 +2150,13 @@ test "parse with comptime field" {
2116	2150	comptime a: i32 = 0,
2117	2151	b: bool,
2118	2152	};
2119		try testing.expectEqual(T{ .a = 0, .b = true }, try parse(T, &TokenStream.init(
	2153	var ts = TokenStream.init(
2120	2154	\\{
2121	2155	\\ "a": 0,
2122	2156	\\ "b": true
2123	2157	\\}
2124		), ParseOptions{}));
	2158	);
	2159	try testing.expectEqual(T{ .a = 0, .b = true }, try parse(T, &ts, ParseOptions{}));
2125	2160	}
2126	2161
2127	2162	{ // string comptime values currently require an allocator
...	...	@@ -2140,12 +2175,13 @@ test "parse with comptime field" {
2140	2175	.allocator = std.testing.allocator,
2141	2176	};
2142	2177
2143		const r = try parse(T, &TokenStream.init(
	2178	var ts = TokenStream.init(
2144	2179	\\{
2145	2180	\\ "kind": "float",
2146	2181	\\ "b": 1.0
2147	2182	\\}
2148		), options);
	2183	);
	2184	const r = try parse(T, &ts, options);
2149	2185
2150	2186	// check that parseFree doesn't try to free comptime fields
2151	2187	parseFree(T, r, options);
...	...	@@ -2154,7 +2190,8 @@ test "parse with comptime field" {
2154	2190
2155	2191	test "parse into struct with no fields" {
2156	2192	const T = struct {};
2157		try testing.expectEqual(T{}, try parse(T, &TokenStream.init("{}"), ParseOptions{}));
	2193	var ts = TokenStream.init("{}");
	2194	try testing.expectEqual(T{}, try parse(T, &ts, ParseOptions{}));
2158	2195	}
2159	2196
2160	2197	test "parse into struct with misc fields" {
...	...	@@ -2186,7 +2223,7 @@ test "parse into struct with misc fields" {
2186	2223	string: []const u8,
2187	2224	};
2188	2225	};
2189		const r = try parse(T, &TokenStream.init(
	2226	var ts = TokenStream.init(
2190	2227	\\{
2191	2228	\\ "int": 420,
2192	2229	\\ "float": 3.14,
...	...	@@ -2208,7 +2245,8 @@ test "parse into struct with misc fields" {
2208	2245	\\ ],
2209	2246	\\ "a_union": 100000
2210	2247	\\}
2211		), options);
	2248	);
	2249	const r = try parse(T, &ts, options);
2212	2250	defer parseFree(T, r, options);
2213	2251	try testing.expectEqual(@as(i64, 420), r.int);
2214	2252	try testing.expectEqual(@as(f64, 3.14), r.float);
...	...	@@ -2239,14 +2277,15 @@ test "parse into struct with strings and arrays with sentinels" {
2239	2277	data: [:99]const i32,
2240	2278	simple_data: []const i32,
2241	2279	};
2242		const r = try parse(T, &TokenStream.init(
	2280	var ts = TokenStream.init(
2243	2281	\\{
2244	2282	\\ "language": "zig",
2245	2283	\\ "language_without_sentinel": "zig again!",
2246	2284	\\ "data": [1, 2, 3],
2247	2285	\\ "simple_data": [4, 5, 6]
2248	2286	\\}
2249		), options);
	2287	);
	2288	const r = try parse(T, &ts, options);
2250	2289	defer parseFree(T, r, options);
2251	2290
2252	2291	try testing.expectEqualSentinel(u8, 0, "zig", r.language);
...	...	@@ -2275,19 +2314,25 @@ test "parse into struct with duplicate field" {
2275	2314
2276	2315	const T1 = struct { a: *u64 };
2277	2316	// both .UseFirst and .UseLast should fail because second "a" value isn't a u64
2278		try testing.expectError(error.InvalidNumber, parse(T1, &TokenStream.init(str), options_first));
2279		try testing.expectError(error.InvalidNumber, parse(T1, &TokenStream.init(str), options_last));
	2317	var ts = TokenStream.init(str);
	2318	try testing.expectError(error.InvalidNumber, parse(T1, &ts, options_first));
	2319	ts = TokenStream.init(str);
	2320	try testing.expectError(error.InvalidNumber, parse(T1, &ts, options_last));
2280	2321
2281	2322	const T2 = struct { a: f64 };
2282		try testing.expectEqual(T2{ .a = 1.0 }, try parse(T2, &TokenStream.init(str), options_first));
2283		try testing.expectEqual(T2{ .a = 0.25 }, try parse(T2, &TokenStream.init(str), options_last));
	2323	ts = TokenStream.init(str);
	2324	try testing.expectEqual(T2{ .a = 1.0 }, try parse(T2, &ts, options_first));
	2325	ts = TokenStream.init(str);
	2326	try testing.expectEqual(T2{ .a = 0.25 }, try parse(T2, &ts, options_last));
2284	2327
2285	2328	const T3 = struct { comptime a: f64 = 1.0 };
2286	2329	// .UseFirst should succeed because second "a" value is unconditionally ignored (even though != 1.0)
2287	2330	const t3 = T3{ .a = 1.0 };
2288		try testing.expectEqual(t3, try parse(T3, &TokenStream.init(str), options_first));
	2331	ts = TokenStream.init(str);
	2332	try testing.expectEqual(t3, try parse(T3, &ts, options_first));
2289	2333	// .UseLast should fail because second "a" value is 0.25 which is not equal to default value of 1.0
2290		try testing.expectError(error.UnexpectedValue, parse(T3, &TokenStream.init(str), options_last));
	2334	ts = TokenStream.init(str);
	2335	try testing.expectError(error.UnexpectedValue, parse(T3, &ts, options_last));
2291	2336	}
2292	2337
2293	2338	test "parse into struct ignoring unknown fields" {
...	...	@@ -2301,7 +2346,7 @@ test "parse into struct ignoring unknown fields" {
2301	2346	.ignore_unknown_fields = true,
2302	2347	};
2303	2348
2304		const r = try parse(T, &std.json.TokenStream.init(
	2349	var ts = TokenStream.init(
2305	2350	\\{
2306	2351	\\ "int": 420,
2307	2352	\\ "float": 3.14,
...	...	@@ -2323,7 +2368,8 @@ test "parse into struct ignoring unknown fields" {
2323	2368	\\ "a_union": 100000,
2324	2369	\\ "language": "zig"
2325	2370	\\}
2326		), ops);
	2371	);
	2372	const r = try parse(T, &ts, ops);
2327	2373	defer parseFree(T, r, ops);
2328	2374
2329	2375	try testing.expectEqual(@as(i64, 420), r.int);
...	...	@@ -2341,7 +2387,8 @@ test "parse into recursive union definition" {
2341	2387	};
2342	2388	const ops = ParseOptions{ .allocator = testing.allocator };
2343	2389
2344		const r = try parse(T, &std.json.TokenStream.init("{\"values\":[58]}"), ops);
	2390	var ts = TokenStream.init("{\"values\":[58]}");
	2391	const r = try parse(T, &ts, ops);
2345	2392	defer parseFree(T, r, ops);
2346	2393
2347	2394	try testing.expectEqual(@as(i64, 58), r.values.array[0].integer);
...	...	@@ -2363,7 +2410,8 @@ test "parse into double recursive union definition" {
2363	2410	};
2364	2411	const ops = ParseOptions{ .allocator = testing.allocator };
2365	2412
2366		const r = try parse(T, &std.json.TokenStream.init("{\"values\":[[58]]}"), ops);
	2413	var ts = TokenStream.init("{\"values\":[[58]]}");
	2414	const r = try parse(T, &ts, ops);
2367	2415	defer parseFree(T, r, ops);
2368	2416
2369	2417	try testing.expectEqual(@as(i64, 58), r.values.array[0].array[0].integer);
...	...	@@ -2806,10 +2854,13 @@ test "integer after float has proper type" {
2806	2854
2807	2855	test "parse exponential into int" {
2808	2856	const T = struct { int: i64 };
2809		const r = try parse(T, &TokenStream.init("{ \"int\": 4.2e2 }"), ParseOptions{});
	2857	var ts = TokenStream.init("{ \"int\": 4.2e2 }");
	2858	const r = try parse(T, &ts, ParseOptions{});
2810	2859	try testing.expectEqual(@as(i64, 420), r.int);
2811		try testing.expectError(error.InvalidNumber, parse(T, &TokenStream.init("{ \"int\": 0.042e2 }"), ParseOptions{}));
2812		try testing.expectError(error.Overflow, parse(T, &TokenStream.init("{ \"int\": 18446744073709551616.0 }"), ParseOptions{}));
	2860	ts = TokenStream.init("{ \"int\": 0.042e2 }");
	2861	try testing.expectError(error.InvalidNumber, parse(T, &ts, ParseOptions{}));
	2862	ts = TokenStream.init("{ \"int\": 18446744073709551616.0 }");
	2863	try testing.expectError(error.Overflow, parse(T, &ts, ParseOptions{}));
2813	2864	}
2814	2865
2815	2866	test "escaped characters" {
...	...	@@ -2858,10 +2909,12 @@ test "string copy option" {
2858	2909	defer arena_allocator.deinit();
2859	2910	const allocator = arena_allocator.allocator();
2860	2911
2861		const tree_nocopy = try Parser.init(allocator, false).parse(input);
	2912	var parser = Parser.init(allocator, false);
	2913	const tree_nocopy = try parser.parse(input);
2862	2914	const obj_nocopy = tree_nocopy.root.Object;
2863	2915
2864		const tree_copy = try Parser.init(allocator, true).parse(input);
	2916	parser = Parser.init(allocator, true);
	2917	const tree_copy = try parser.parse(input);
2865	2918	const obj_copy = tree_copy.root.Object;
2866	2919
2867	2920	for ([_][]const u8{ "noescape", "simple", "unicode", "surrogatepair" }) \|field_name\| {
...	...	@@ -3376,14 +3429,12 @@ test "stringify null optional fields" {
3376	3429	StringifyOptions{ .emit_null_optional_fields = false },
3377	3430	);
3378	3431
3379		try std.testing.expect(try parsesTo(
3380		MyStruct,
3381		MyStruct{},
3382		&TokenStream.init(
3383		\\{"required":"something","another_required":"something else"}
3384		),
3385		.{ .allocator = std.testing.allocator },
3386		));
	3432	var ts = TokenStream.init(
	3433	\\{"required":"something","another_required":"something else"}
	3434	);
	3435	try std.testing.expect(try parsesTo(MyStruct, MyStruct{}, &ts, .{
	3436	.allocator = std.testing.allocator,
	3437	}));
3387	3438	}
3388	3439
3389	3440	// Same as `stringify` but accepts an Allocator and stores result in dynamically allocated memory instead of using a Writer.

lib/std/meta.zig+4-1

...	...	@@ -311,7 +311,10 @@ pub fn assumeSentinel(p: anytype, comptime sentinel_val: Elem(@TypeOf(p))) Senti
311	311	const ReturnType = Sentinel(T, sentinel_val);
312	312	switch (@typeInfo(T)) {
313	313	.Pointer => \|info\| switch (info.size) {
314		.Slice => return @bitCast(ReturnType, p),
	314	.Slice => if (@import("builtin").zig_backend == .stage1)
	315	return @bitCast(ReturnType, p)
	316	else
	317	return @ptrCast(ReturnType, p),
315	318	.Many, .One => return @ptrCast(ReturnType, p),
316	319	.C => {},
317	320	},

lib/std/net.zig+7-5

...	...	@@ -1141,18 +1141,20 @@ fn linuxLookupNameFromHosts(
1141	1141	};
1142	1142	defer file.close();
1143	1143
1144		const stream = std.io.bufferedReader(file.reader()).reader();
	1144	var buffered_reader = std.io.bufferedReader(file.reader());
	1145	const reader = buffered_reader.reader();
1145	1146	var line_buf: [512]u8 = undefined;
1146		while (stream.readUntilDelimiterOrEof(&line_buf, '\n') catch \|err\| switch (err) {
	1147	while (reader.readUntilDelimiterOrEof(&line_buf, '\n') catch \|err\| switch (err) {
1147	1148	error.StreamTooLong => blk: {
1148		// Skip to the delimiter in the stream, to fix parsing
1149		try stream.skipUntilDelimiterOrEof('\n');
	1149	// Skip to the delimiter in the reader, to fix parsing
	1150	try reader.skipUntilDelimiterOrEof('\n');
1150	1151	// Use the truncated line. A truncated comment or hostname will be handled correctly.
1151	1152	break :blk &line_buf;
1152	1153	},
1153	1154	else => \|e\| return e,
1154	1155	}) \|line\| {
1155		const no_comment_line = mem.split(u8, line, "#").next().?;
	1156	var split_it = mem.split(u8, line, "#");
	1157	const no_comment_line = split_it.next().?;
1156	1158
1157	1159	var line_it = mem.tokenize(u8, no_comment_line, " \t");
1158	1160	const ip_text = line_it.next() orelse continue;

lib/std/zig/c_translation.zig+29-7

...	...	@@ -8,10 +8,19 @@ pub fn cast(comptime DestType: type, target: anytype) DestType {
8	8	// this function should behave like transCCast in translate-c, except it's for macros
9	9	const SourceType = @TypeOf(target);
10	10	switch (@typeInfo(DestType)) {
11		.Fn, .Pointer => return castToPtr(DestType, SourceType, target),
	11	.Fn => if (@import("builtin").zig_backend == .stage1)
	12	return castToPtr(DestType, SourceType, target)
	13	else
	14	return castToPtr(*const DestType, SourceType, target),
	15	.Pointer => return castToPtr(DestType, SourceType, target),
12	16	.Optional => \|dest_opt\| {
13		if (@typeInfo(dest_opt.child) == .Pointer or @typeInfo(dest_opt.child) == .Fn) {
	17	if (@typeInfo(dest_opt.child) == .Pointer) {
14	18	return castToPtr(DestType, SourceType, target);
	19	} else if (@typeInfo(dest_opt.child) == .Fn) {
	20	if (@import("builtin").zig_backend == .stage1)
	21	return castToPtr(DestType, SourceType, target)
	22	else
	23	return castToPtr(?*const dest_opt.child, SourceType, target);
15	24	}
16	25	},
17	26	.Int => {
...	...	@@ -124,7 +133,10 @@ test "cast" {
124	133	try testing.expect(cast(?anyopaque, -1) == @intToPtr(?anyopaque, @bitCast(usize, @as(isize, -1))));
125	134	try testing.expect(cast(?anyopaque, foo) == @intToPtr(?anyopaque, @bitCast(usize, @as(isize, -1))));
126	135
127		const FnPtr = ?fn (*anyopaque) void;
	136	const FnPtr = if (@import("builtin").zig_backend == .stage1)
	137	?fn (*anyopaque) void
	138	else
	139	?const fn (anyopaque) void;
128	140	try testing.expect(cast(FnPtr, 0) == @intToPtr(FnPtr, @as(usize, 0)));
129	141	try testing.expect(cast(FnPtr, foo) == @intToPtr(FnPtr, @bitCast(usize, @as(isize, -1))));
130	142	}
...	...	@@ -135,9 +147,14 @@ pub fn sizeof(target: anytype) usize {
135	147	switch (@typeInfo(T)) {
136	148	.Float, .Int, .Struct, .Union, .Array, .Bool, .Vector => return @sizeOf(T),
137	149	.Fn => {
138		// sizeof(main) returns 1, sizeof(&main) returns pointer size.
139		// We cannot distinguish those types in Zig, so use pointer size.
140		return @sizeOf(T);
	150	if (@import("builtin").zig_backend == .stage1) {
	151	// sizeof(main) returns 1, sizeof(&main) returns pointer size.
	152	// We cannot distinguish those types in Zig, so use pointer size.
	153	return @sizeOf(T);
	154	}
	155
	156	// sizeof(main) in C returns 1
	157	return 1;
141	158	},
142	159	.Null => return @sizeOf(*anyopaque),
143	160	.Void => {
...	...	@@ -233,7 +250,12 @@ test "sizeof" {
233	250	try testing.expect(sizeof(const const [4:0]u8) == ptr_size);
234	251	try testing.expect(sizeof(*const [4]u8) == ptr_size);
235	252
236		try testing.expect(sizeof(sizeof) == @sizeOf(@TypeOf(sizeof)));
	253	if (@import("builtin").zig_backend == .stage1) {
	254	try testing.expect(sizeof(sizeof) == @sizeOf(@TypeOf(sizeof)));
	255	} else if (false) { // TODO
	256	try testing.expect(sizeof(&sizeof) == @sizeOf(@TypeOf(&sizeof)));
	257	try testing.expect(sizeof(sizeof) == 1);
	258	}
237	259
238	260	try testing.expect(sizeof(void) == 1);
239	261	try testing.expect(sizeof(anyopaque) == 1);