Commit 0d022eb1d6333e6e027d35e9588b5a10035664b7 | zig

2 files changed, 21 insertions(+), 1 deletions(-)

lib/std/zig/parser_test.zig+15

...	@@ -107,6 +107,21 @@ test "zig fmt: rewrite suspend without block expression" {	...	@@ -107,6 +107,21 @@ test "zig fmt: rewrite suspend without block expression" {
107	);	107	);
108	}	108	}
109		109
		110	// TODO Remove this after zig 0.9.0 is released.
		111	test "zig fmt: rewrite @byteOffsetOf to @offsetOf" {
		112	try testTransform(
		113	\\fn foo() void {
		114	\\ @byteOffsetOf(Foo, "bar");
		115	\\}
		116	\\
		117	,
		118	\\fn foo() void {
		119	\\ @offsetOf(Foo, "bar");
		120	\\}
		121	\\
		122	);
		123	}
		124
110	test "zig fmt: simple top level comptime block" {	125	test "zig fmt: simple top level comptime block" {
111	try testCanonical(	126	try testCanonical(
112	\\// line comment	127	\\// line comment

lib/std/zig/render.zig+6-1

 @@ -1211,7 +1211,12 @@ fn renderBuiltinCall(
 ) Error!void {
     const token_tags = tree.tokens.items(.tag);
-    try renderToken(ais, tree, builtin_token, .none); // @name
+    const builtin_name = tokenSliceForRender(tree, builtin_token);
+    if (mem.eql(u8, builtin_name, "@byteOffsetOf")) {
+        try ais.writer().writeAll("@offsetOf");
+    } else {
+        try renderToken(ais, tree, builtin_token, .none); // @name
+    }
     if (params.len == 0) {
         try renderToken(ais, tree, builtin_token + 1, .none); // (