From 68fcbb5c0d5ece02876824a8be0e18b306954e26 Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sun, 29 Aug 2021 19:41:57 +0200
Subject: [PATCH] Address Spaces: fmt a bunch of stuff

---
 lib/std/zig/render.zig |  3 ++-
 src/AstGen.zig         |  4 ++--
 src/Zir.zig            |  2 +-
 src/type.zig           | 10 +++++-----
 test/cases.zig         |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
index 0703b5bbfae8c84612eb90492ed3d959ad44df97..3029d38cb92734b4b4f9a11c9975857a7d2cdada 100644
--- a/lib/std/zig/render.zig
+++ b/lib/std/zig/render.zig
@@ -958,7 +958,8 @@ fn renderVarDecl(gpa: *Allocator, ais: *Ais, tree: Ast, var_decl: Ast.full.VarDe
         try renderToken(ais, tree, lparen, Space.none); // (
         try renderExpression(gpa, ais, tree, var_decl.ast.align_node, Space.none);
         if (var_decl.ast.addrspace_node != 0 or var_decl.ast.section_node != 0 or
-            var_decl.ast.init_node != 0) {
+            var_decl.ast.init_node != 0)
+        {
             try renderToken(ais, tree, rparen, .space); // )
         } else {
             try renderToken(ais, tree, rparen, .none); // )
diff --git a/src/AstGen.zig b/src/AstGen.zig
index cffc626a1e26eed4802093136b1e3c01427f2e44..2e4671d92e346ddacf0453ddc4fc461fe0a73893 100644
--- a/src/AstGen.zig
+++ b/src/AstGen.zig
@@ -2393,11 +2393,11 @@ fn varDecl(
     }
 
     if (var_decl.ast.addrspace_node != 0) {
-        return astgen.failTok(main_tokens[var_decl.ast.addrspace_node], "cannot set address space of local variable '{s}'", .{ ident_name_raw });
+        return astgen.failTok(main_tokens[var_decl.ast.addrspace_node], "cannot set address space of local variable '{s}'", .{ident_name_raw});
     }
 
     if (var_decl.ast.section_node != 0) {
-        return astgen.failTok(main_tokens[var_decl.ast.section_node], "cannot set section of local variable '{s}'", .{ ident_name_raw });
+        return astgen.failTok(main_tokens[var_decl.ast.section_node], "cannot set section of local variable '{s}'", .{ident_name_raw});
     }
 
     const align_inst: Zir.Inst.Ref = if (var_decl.ast.align_node != 0)
diff --git a/src/Zir.zig b/src/Zir.zig
index 0e50f8c256baaed33944d7b8005cee792350d484..50c53e5485c542e2b48355c016c277c1b9ef89a2 100644
--- a/src/Zir.zig
+++ b/src/Zir.zig
@@ -4029,7 +4029,7 @@ const Writer = struct {
             };
             const addrspace_inst: Inst.Ref = if (!has_section_or_addrspace) .none else inst: {
                 const inst = @intToEnum(Inst.Ref, self.code.extra[extra_index]);
-                extra_index +=1;
+                extra_index += 1;
                 break :inst inst;
             };
             const pub_str = if (is_pub) "pub " else "";
diff --git a/src/type.zig b/src/type.zig
index 9cda4aacf7968e74b2bcc7922b2458f918806776..fa2147f852a69bd85ba2cf592e3a4abfba3c0d89 100644
--- a/src/type.zig
+++ b/src/type.zig
@@ -1002,7 +1002,7 @@ pub const Type = extern union {
                     try writer.writeAll(@tagName(payload.cc));
                     try writer.writeAll(") ");
                     if (payload.@"addrspace" != .generic) {
-                        try writer.print("addrspace(.{s}) ", .{ @tagName(payload.@"addrspace") });
+                        try writer.print("addrspace(.{s}) ", .{@tagName(payload.@"addrspace")});
                     }
                     ty = payload.return_type;
                     continue;
@@ -1136,7 +1136,7 @@ pub const Type = extern union {
                         try writer.writeAll(") ");
                     }
                     if (payload.@"addrspace" != .generic) {
-                        try writer.print("addrspace(.{s}) ", .{ @tagName(payload.@"addrspace") });
+                        try writer.print("addrspace(.{s}) ", .{@tagName(payload.@"addrspace")});
                     }
                     if (!payload.mutable) try writer.writeAll("const ");
                     if (payload.@"volatile") try writer.writeAll("volatile ");
@@ -2197,8 +2197,8 @@ pub const Type = extern union {
                     payload.bit_offset != 0 or
                     payload.host_size != 0 or
                     payload.@"allowzero" or
-                    payload.@"volatile"
-                ) {
+                    payload.@"volatile")
+                {
                     buffer.pointer = .{
                         .data = .{
                             .pointee_type = payload.pointee_type,
@@ -2210,7 +2210,7 @@ pub const Type = extern union {
                             .@"allowzero" = payload.@"allowzero",
                             .mutable = payload.mutable,
                             .@"volatile" = payload.@"volatile",
-                            .size = .Many
+                            .size = .Many,
                         },
                     };
                     return Type.initPayload(&buffer.pointer.base);
diff --git a/test/cases.zig b/test/cases.zig
index 62677b8424dfae4d0929f5e24da1ee3f8db62061..33fa5b19e2a30b1e25de2037147a2d949f0222a1 100644
--- a/test/cases.zig
+++ b/test/cases.zig
@@ -861,7 +861,7 @@ pub fn addCases(ctx: *TestContext) !void {
             "Hello, World!\n",
         );
         try case.files.append(.{
-            .src =
+            .src = 
             \\pub fn print() void {
             \\    asm volatile ("syscall"
             \\        :
@@ -924,7 +924,7 @@ pub fn addCases(ctx: *TestContext) !void {
             },
         );
         try case.files.append(.{
-            .src =
+            .src = 
             \\// dummy comment to make print be on line 2
             \\fn print() void {
             \\    asm volatile ("syscall"
-- 
2.54.0