Skip to content

Commit 6fc47f6

Browse files
committed
zig fmt: rewrite byteOffsetOf to offsetOf
1 parent 2f68fa6 commit 6fc47f6

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

lib/std/zig/parser_test.zig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,21 @@ test "zig fmt: rewrite suspend without block expression" {
107107
);
108108
}
109109

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+
110125
test "zig fmt: simple top level comptime block" {
111126
try testCanonical(
112127
\\// line comment

lib/std/zig/render.zig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,12 @@ fn renderBuiltinCall(
12111211
) Error!void {
12121212
const token_tags = tree.tokens.items(.tag);
12131213

1214-
try renderToken(ais, tree, builtin_token, .none); // @name
1214+
const builtin_name = tokenSliceForRender(tree, builtin_token);
1215+
if (mem.eql(u8, builtin_name, "@byteOffsetOf")) {
1216+
try ais.writer().writeAll("@offsetOf");
1217+
} else {
1218+
try renderToken(ais, tree, builtin_token, .none); // @name
1219+
}
12151220

12161221
if (params.len == 0) {
12171222
try renderToken(ais, tree, builtin_token + 1, .none); // (

0 commit comments

Comments
 (0)