zig fmt

3 files changed, 37 insertions, 41 deletions

diff --git a/tools/gen_spirv_spec.zig b/tools/gen_spirv_spec.zig
index 36b9d06a7c..f00bd1884b 100644
--- a/tools/gen_spirv_spec.zig
+++ b/tools/gen_spirv_spec.zig
@@ -15,7 +15,7 @@ pub fn main() !void {
     const spec = try std.fs.cwd().readFileAlloc(allocator, spec_path, std.math.maxInt(usize));
 
     var tokens = std.json.TokenStream.init(spec);
-    var registry = try std.json.parse(g.Registry, &tokens, .{.allocator = allocator});
+    var registry = try std.json.parse(g.Registry, &tokens, .{ .allocator = allocator });
 
     var bw = std.io.bufferedWriter(std.io.getStdOut().writer());
     try render(bw.writer(), registry);
@@ -36,7 +36,8 @@ fn render(writer: anytype, registry: g.Registry) !void {
                 \\pub const version = Version{{ .major = {}, .minor = {}, .patch = {} }};
                 \\pub const magic_number: u32 = {s};
                 \\
-                , .{ core_reg.major_version, core_reg.minor_version, core_reg.revision, core_reg.magic_number },
+            ,
+                .{ core_reg.major_version, core_reg.minor_version, core_reg.revision, core_reg.magic_number },
             );
             try renderOpcodes(writer, core_reg.instructions);
             try renderOperandKinds(writer, core_reg.operand_kinds);
@@ -45,11 +46,12 @@ fn render(writer: anytype, registry: g.Registry) !void {
             try writer.print(
                 \\pub const version = Version{{ .major = {}, .minor = 0, .patch = {} }};
                 \\
-                , .{ ext_reg.version, ext_reg.revision },
+            ,
+                .{ ext_reg.version, ext_reg.revision },
             );
             try renderOpcodes(writer, ext_reg.instructions);
             try renderOperandKinds(writer, ext_reg.operand_kinds);
-        }
+        },
     }
 }
 
@@ -72,7 +74,7 @@ fn renderOperandKinds(writer: anytype, kinds: []const g.OperandKind) !void {
 }
 
 fn renderValueEnum(writer: anytype, enumeration: g.OperandKind) !void {
-    try writer.print("pub const {s} = extern enum(u32) {{\n", .{ enumeration.kind });
+    try writer.print("pub const {s} = extern enum(u32) {{\n", .{enumeration.kind});
 
     const enumerants = enumeration.enumerants orelse return error.InvalidRegistry;
     for (enumerants) |enumerant| {
@@ -85,7 +87,7 @@ fn renderValueEnum(writer: anytype, enumeration: g.OperandKind) !void {
 }
 
 fn renderBitEnum(writer: anytype, enumeration: g.OperandKind) !void {
-    try writer.print("pub const {s} = packed struct {{\n", .{ enumeration.kind });
+    try writer.print("pub const {s} = packed struct {{\n", .{enumeration.kind});
 
     var flags_by_bitpos = [_]?[]const u8{null} ** 32;
     const enumerants = enumeration.enumerants orelse return error.InvalidRegistry;
@@ -97,7 +99,7 @@ fn renderBitEnum(writer: anytype, enumeration: g.OperandKind) !void {
         }
 
         var bitpos = std.math.log2_int(u32, value);
-        if (flags_by_bitpos[bitpos]) |*existing|{
+        if (flags_by_bitpos[bitpos]) |*existing| {
             // Keep the shortest
             if (enumerant.enumerant.len < existing.len)
                 existing.* = enumerant.enumerant;
@@ -128,7 +130,7 @@ fn parseHexInt(text: []const u8) !u31 {
     const prefix = "0x";
     if (!std.mem.startsWith(u8, text, prefix))
         return error.InvalidHexInt;
-    return try std.fmt.parseInt(u31, text[prefix.len ..], 16);
+    return try std.fmt.parseInt(u31, text[prefix.len..], 16);
 }
 
 fn usageAndExit(file: std.fs.File, arg0: []const u8, code: u8) noreturn {
@@ -142,7 +144,6 @@ fn usageAndExit(file: std.fs.File, arg0: []const u8, code: u8) noreturn {
         \\The relevant specifications can be obtained from the SPIR-V registry:
         \\https://github.com/KhronosGroup/SPIRV-Headers/blob/master/include/spirv/unified1/
         \\
-        , .{arg0}
-    ) catch std.process.exit(1);
+    , .{arg0}) catch std.process.exit(1);
     std.process.exit(code);
 }
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 6f986ee6df..ad2a9ffe53 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -339,7 +339,7 @@ const known_options = [_]KnownOpt{
     .{
         .name = "mexec-model",
         .ident = "exec_model",
-    }
+    },
 };
 
 const blacklisted_options = [_][]const u8{};
diff --git a/tools/update_spirv_features.zig b/tools/update_spirv_features.zig
index 94fdb38229..da1cefcd9c 100644
--- a/tools/update_spirv_features.zig
+++ b/tools/update_spirv_features.zig
@@ -1,8 +1,3 @@
-const std = @import("std");
-const fs = std.fs;
-const Allocator = std.mem.Allocator;
-const g = @import("spirv/grammar.zig");
-
 //! This tool generates SPIR-V features from the grammar files in the SPIRV-Headers
 //! (https://github.com/KhronosGroup/SPIRV-Headers/) and SPIRV-Registry (https://github.com/KhronosGroup/SPIRV-Registry/)
 //! repositories. Currently it only generates a basic feature set definition consisting of versions, extensions and capabilities.
@@ -14,6 +9,11 @@ const g = @import("spirv/grammar.zig");
 //!   from an intel project (https://github.com/intel/llvm/, https://github.com/intel/llvm/tree/sycl/sycl/doc/extensions/SPIRV),
 //!   and so ONLY extensions in the SPIRV-Registry should be included.
 
+const std = @import("std");
+const fs = std.fs;
+const Allocator = std.mem.Allocator;
+const g = @import("spirv/grammar.zig");
+
 const Version = struct {
     major: u32,
     minor: u32,
@@ -38,9 +38,9 @@ const Version = struct {
 
     fn lessThan(ctx: void, a: Version, b: Version) bool {
         return if (a.major == b.major)
-                a.minor < b.minor
-            else
-                a.major < b.major;
+            a.minor < b.minor
+        else
+            a.major < b.major;
     }
 };
 
@@ -103,11 +103,11 @@ pub fn main() !void {
     }
 
     for (extensions) |ext| {
-        try w.print("    {},\n", .{ std.zig.fmtId(ext) });
+        try w.print("    {},\n", .{std.zig.fmtId(ext)});
     }
 
     for (capabilities) |cap| {
-        try w.print("    {},\n", .{ std.zig.fmtId(cap.enumerant) });
+        try w.print("    {},\n", .{std.zig.fmtId(cap.enumerant)});
     }
 
     try w.writeAll(
@@ -129,8 +129,7 @@ pub fn main() !void {
             \\        .llvm_name = null,
             \\        .description = "SPIR-V version {0}.{1}",
             \\
-            , .{ ver.major, ver.minor }
-        );
+        , .{ ver.major, ver.minor });
 
         if (i == 0) {
             try w.writeAll(
@@ -145,8 +144,7 @@ pub fn main() !void {
                 \\        }}),
                 \\    }};
                 \\
-                , .{ versions[i - 1].major, versions[i - 1].minor }
-            );
+            , .{ versions[i - 1].major, versions[i - 1].minor });
         }
     }
 
@@ -159,11 +157,10 @@ pub fn main() !void {
             \\        .dependencies = featureSet(&[_]Feature{{}}),
             \\    }};
             \\
-            , .{
-                std.zig.fmtId(ext),
-                ext,
-            }
-        );
+        , .{
+            std.zig.fmtId(ext),
+            ext,
+        });
     }
 
     // TODO: Capability extension dependencies.
@@ -174,11 +171,10 @@ pub fn main() !void {
             \\        .description = "Enable SPIR-V capability {s}",
             \\        .dependencies = featureSet(&[_]Feature{{
             \\
-            , .{
-                std.zig.fmtId(cap.enumerant),
-                cap.enumerant,
-            }
-        );
+        , .{
+            std.zig.fmtId(cap.enumerant),
+            cap.enumerant,
+        });
 
         if (cap.version) |ver_str| {
             if (!std.mem.eql(u8, ver_str, "None")) {
@@ -188,7 +184,7 @@ pub fn main() !void {
         }
 
         for (cap.capabilities) |cap_dep| {
-            try w.print("            .{},\n", .{ std.zig.fmtId(cap_dep) });
+            try w.print("            .{},\n", .{std.zig.fmtId(cap_dep)});
         }
 
         try w.writeAll(
@@ -198,7 +194,7 @@ pub fn main() !void {
         );
     }
 
-   try w.writeAll(
+    try w.writeAll(
         \\    const ti = @typeInfo(Feature);
         \\    for (result) |*elem, i| {
         \\        elem.index = i;
@@ -217,7 +213,7 @@ pub fn main() !void {
 /// registered ones.
 /// TODO: Unfortunately, neither repository contains a machine-readable list of extension dependencies.
 fn gather_extensions(allocator: *Allocator, spirv_registry_root: []const u8) ![]const []const u8 {
-    const extensions_path = try fs.path.join(allocator, &.{spirv_registry_root, "extensions"});
+    const extensions_path = try fs.path.join(allocator, &.{ spirv_registry_root, "extensions" });
     var extensions_dir = try fs.cwd().openDir(extensions_path, .{ .iterate = true });
     defer extensions_dir.close();
 
@@ -262,7 +258,7 @@ fn gather_extensions(allocator: *Allocator, spirv_registry_root: []const u8) ![]
             }
 
             const ext_end = std.mem.indexOfScalarPos(u8, ext_spec, ext_start, '\n') orelse return error.InvalidRegistry;
-            const ext = ext_spec[ext_start .. ext_end];
+            const ext = ext_spec[ext_start..ext_end];
 
             std.debug.assert(std.mem.startsWith(u8, ext, "SPV_")); // Sanity check, all extensions should have a name like SPV_VENDOR_extension.
 
@@ -315,7 +311,6 @@ fn usageAndExit(file: fs.File, arg0: []const u8, code: u8) noreturn {
         \\SPIRV-Headers can be cloned from https://github.com/KhronosGroup/SPIRV-Headers,
         \\SPIRV-Registry can be cloned from https://github.com/KhronosGroup/SPIRV-Registry.
         \\
-        , .{arg0}
-    ) catch std.process.exit(1);
+    , .{arg0}) catch std.process.exit(1);
     std.process.exit(code);
 }