Update usages of `fmtId`/`isValidId`

`{}` for decls
`{p}` for enum fields
`{p_}` for struct fields and in contexts following a `.`

Elsewhere, `{p}` was used since it's equivalent to the old behavior.

1 files changed, 12 insertions, 12 deletions

diff --git a/tools/generate_linux_syscalls.zig b/tools/generate_linux_syscalls.zig
index 410c971a60..8c066f749e 100644
--- a/tools/generate_linux_syscalls.zig
+++ b/tools/generate_linux_syscalls.zig
@@ -61,7 +61,7 @@ pub fn main() !void {
             _ = fields.next() orelse return error.Incomplete;
             const name = fields.next() orelse return error.Incomplete;
 
-            try writer.print("    {s} = {s},\n", .{ zig.fmtId(name), number });
+            try writer.print("    {p} = {s},\n", .{ zig.fmtId(name), number });
         }
 
         try writer.writeAll("};\n\n");
@@ -82,7 +82,7 @@ pub fn main() !void {
             const name = fields.next() orelse return error.Incomplete;
 
             const fixed_name = if (stdlib_renames.get(name)) |fixed| fixed else name;
-            try writer.print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+            try writer.print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
         }
 
         try writer.writeAll("};\n\n");
@@ -107,7 +107,7 @@ pub fn main() !void {
             const name = fields.next() orelse return error.Incomplete;
 
             const fixed_name = if (stdlib_renames.get(name)) |fixed| fixed else name;
-            try writer.print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+            try writer.print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
         }
 
         // TODO: maybe extract these from arch/arm/include/uapi/asm/unistd.h
@@ -137,7 +137,7 @@ pub fn main() !void {
             if (mem.eql(u8, abi, "32")) continue;
             const name = fields.next() orelse return error.Incomplete;
 
-            try writer.print("    {s} = {s},\n", .{ zig.fmtId(name), number });
+            try writer.print("    {p} = {s},\n", .{ zig.fmtId(name), number });
         }
 
         try writer.writeAll("};\n\n");
@@ -162,7 +162,7 @@ pub fn main() !void {
             const name = fields.next() orelse return error.Incomplete;
             if (mem.startsWith(u8, name, "unused")) continue;
 
-            try writer.print("    {s} = Linux + {s},\n", .{ zig.fmtId(name), number });
+            try writer.print("    {p} = Linux + {s},\n", .{ zig.fmtId(name), number });
         }
 
         try writer.writeAll("};\n\n");
@@ -187,7 +187,7 @@ pub fn main() !void {
             const name = fields.next() orelse return error.Incomplete;
             const fixed_name = if (stdlib_renames.get(name)) |fixed| fixed else name;
 
-            try writer.print("    {s} = Linux + {s},\n", .{ zig.fmtId(fixed_name), number });
+            try writer.print("    {p} = Linux + {s},\n", .{ zig.fmtId(fixed_name), number });
         }
 
         try writer.writeAll("};\n\n");
@@ -210,12 +210,12 @@ pub fn main() !void {
             if (mem.eql(u8, abi, "spu")) {
                 continue;
             } else if (mem.eql(u8, abi, "32")) {
-                try writer.print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+                try writer.print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
             } else if (mem.eql(u8, abi, "64")) {
-                try list_64.writer().print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+                try list_64.writer().print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
             } else { // common/nospu
-                try writer.print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
-                try list_64.writer().print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+                try writer.print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
+                try list_64.writer().print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
             }
         }
 
@@ -291,7 +291,7 @@ pub fn main() !void {
             if (mem.eql(u8, name, "syscalls")) break :loop;
 
             const fixed_name = if (stdlib_renames.get(name)) |fixed| fixed else name;
-            try writer.print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+            try writer.print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
         }
 
         try writer.writeAll("};\n\n");
@@ -352,7 +352,7 @@ pub fn main() !void {
             if (mem.eql(u8, name, "syscalls")) break :loop;
 
             const fixed_name = if (stdlib_renames.get(name)) |fixed| fixed else name;
-            try writer.print("    {s} = {s},\n", .{ zig.fmtId(fixed_name), number });
+            try writer.print("    {p} = {s},\n", .{ zig.fmtId(fixed_name), number });
         }
 
         try writer.writeAll(