chore: zig fmt

Author: hanabi1224

bench/algorithm/fannkuch-redux/1.zig

@@ -20,7 +20,7 @@ pub fn main() !void {
     var perm_count: usize = 0;
     var checksum: isize = 0;
 
-    for (perm1) |*e, i| {
+    for (perm1, 0..) |*e, i| {
         e.* = i;
     }
 
@@ -31,7 +31,7 @@ pub fn main() !void {
                 count[r - 1] = r;
             }
 
-            for (perm) |_, i| {
+            for (perm, 0..) |_, i| {
                 perm[i] = perm1[i];
             }
 

bench/algorithm/fannkuch-redux/2-m.zig

@@ -5,32 +5,32 @@ const Vec = std.meta.Vector(max_n, u8);
 
 fn runInParallel(tasks: []std.Thread, len: usize, comptime f: anytype, args: anytype) !void {
     const len_per_task = @divTrunc(len, tasks.len + 1);
-    for (tasks) |*task, i| {
-        const first = len_per_task*i;
+    for (tasks, 0..) |*task, i| {
+        const first = len_per_task * i;
         const last = first + len_per_task;
-        task.* = try std.Thread.spawn(.{}, f, .{first, last} ++ args);
+        task.* = try std.Thread.spawn(.{}, f, .{ first, last } ++ args);
     }
-    @call(.auto, f, .{tasks.len*len_per_task, len} ++ args);
+    @call(.auto, f, .{ tasks.len * len_per_task, len } ++ args);
     for (tasks) |*task| task.join();
 }
 
 fn reverse_mask(n: u8) Vec {
     // global constant is not used to workaround a compiler bug
-    var v = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+    var v = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
     var i: u8 = 0;
     while (i < n) : (i += 1) v[i] = n - i - 1;
     return v;
 }
 
 fn rotate_mask(n: u8) Vec {
-    var v = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+    var v = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
     var i: u8 = 0;
     while (i < n) : (i += 1) v[i] = (i + 1) % n;
     return v;
 }
 
 fn nextPermMask(n: u8) Vec {
-    var v = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+    var v = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
     var i: u8 = 2;
     while (i <= n) : (i += 1) v = applyMask(v, i, rotate_mask);
     return v;
@@ -80,7 +80,7 @@ fn countAtPos(n: u8, start: usize) [max_n]u8 {
 }
 
 fn permWithCount(n: u8, count: [max_n]u8) Vec {
-    var perm = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+    var perm = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
     const permVals = std.mem.asBytes(&perm);
     var i = n;
     while (i > 0) : (i -= 1) std.mem.rotate(u8, permVals[0..i], i - count[i - 1]);
@@ -93,23 +93,23 @@ const Stats = struct {
 };
 
 fn nextPermutation(perm: Vec, count: []u8) ?Vec {
-    const r = for (count) |v, i| {
+    const r = for (count, 0..) |v, i| {
         if (v != 1) break @intCast(u8, i);
     } else return null;
     const next_perm = applyMask(perm, r + 1, nextPermMask);
     count[r] -= 1;
-    for (count[0..r]) |*v, i| v.* = @intCast(u8, i + 1);
+    for (count[0..r], 0..) |*v, i| v.* = @intCast(u8, i + 1);
     return next_perm;
 }
 
 fn pfannkuchenStats(first: usize, last: usize, n: u8, res: *Stats) void {
     var count = countAtPos(n, first);
     var perm = permWithCount(n, count);
-    var stats = Stats {};
+    var stats = Stats{};
     var i = first;
     while (i < last) : (i += 1) {
         const flips = pfannkuchen(perm);
-        const parity = 1 - @intCast(i32, i % 2)*2;
+        const parity = 1 - @intCast(i32, i % 2) * 2;
         stats.max_flips = std.math.max(stats.max_flips, flips);
         stats.checksum += @intCast(i32, flips) * parity;
         perm = nextPermutation(perm, count[0..n]) orelse break;
@@ -124,9 +124,9 @@ pub fn main() !void {
     var tasks_buf: [64]std.Thread = undefined;
     const task_count = try std.Thread.getCpuCount();
     const tasks = tasks_buf[0 .. task_count - 1];
-    var stats = Stats {};
+    var stats = Stats{};
     const perms_count = factorialComptime(n);
-    try runInParallel(tasks, perms_count, pfannkuchenStats, .{n, &stats});
+    try runInParallel(tasks, perms_count, pfannkuchenStats, .{ n, &stats });
 
     const stdout = std.io.getStdOut().writer();
     try stdout.print("{d}\nPfannkuchen({d}) = {d}\n", .{ stats.checksum, n, stats.max_flips });

bench/algorithm/fannkuch-redux/2.zig

@@ -4,21 +4,21 @@ const Vec = std.meta.Vector(16, u8);
 
 fn reverse_mask(n: u8) Vec {
     // global constant is not used to workaround a compiler bug
-    var v = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+    var v = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
     var i: u8 = 0;
     while (i < n) : (i += 1) v[i] = n - i - 1;
     return v;
 }
 
 fn rotate_mask(n: u8) Vec {
-    var v = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+    var v = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
     var i: u8 = 0;
     while (i < n) : (i += 1) v[i] = (i + 1) % n;
     return v;
 }
 
 fn next_perm_mask(n: u8) Vec {
-    var v = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+    var v = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
     var i: u8 = 2;
     while (i <= n) : (i += 1) v = apply_mask(v, i, rotate_mask);
     return v;
@@ -47,19 +47,19 @@ pub fn main() !void {
 
     var max_flip_count: u32 = 0;
     var checksum: i32 = 0;
-    var perm = Vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
-    var count = [_]u8 { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+    var perm = Vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+    var count = [_]u8{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
     var parity: u1 = 0;
     while (true) : (parity +%= 1) {
         const flip_count = pfannkuchen(perm);
         max_flip_count = std.math.max(max_flip_count, flip_count);
-        checksum += @intCast(i32, flip_count) * (1 - @intCast(i32, parity)*2);
-        const r = for (count[0..n]) |v, i| {
+        checksum += @intCast(i32, flip_count) * (1 - @intCast(i32, parity) * 2);
+        const r = for (count[0..n], 0..) |v, i| {
             if (v != 1) break @intCast(u8, i);
         } else break;
         perm = apply_mask(perm, r + 1, next_perm_mask);
         count[r] -= 1;
-        for (count[1..r]) |*v, i| v.* = @intCast(u8, i + 2);
+        for (count[1..r], 0..) |*v, i| v.* = @intCast(u8, i + 2);
     }
 
     const stdout = std.io.getStdOut().writer();

bench/algorithm/fasta/1.zig

@@ -20,7 +20,7 @@ const AminoAcid = struct {
 
 fn repeatAndWrap(out: anytype, comptime sequence: []const u8, count: usize) void {
     var padded_sequence: [sequence.len + max_line_length]u8 = undefined;
-    for (padded_sequence) |*e, i| {
+    for (&padded_sequence, 0..) |*e, i| {
         e.* = sequence[i % sequence.len];
     }
 
@@ -44,7 +44,7 @@ fn repeatAndWrap(out: anytype, comptime sequence: []const u8, count: usize) void
 fn generateAndWrap(out: anytype, comptime nucleotides: []const AminoAcid, count: usize) void {
     var cum_prob: f64 = 0;
     var cum_prob_total: [nucleotides.len]f64 = undefined;
-    for (nucleotides) |n, i| {
+    for (nucleotides, 0..) |n, i| {
         cum_prob += n.p;
         cum_prob_total[i] = cum_prob * im;
     }

bench/algorithm/json-serde/1.zig

@@ -87,10 +87,10 @@ const Geometry = struct {
             \\","coordinates":[
         ;
         _ = try out_stream.write(coordsstr);
-        for (value.coordinates) |row, rowi| {
+        for (value.coordinates, 0..) |row, rowi| {
             if (rowi != 0) _ = try out_stream.write(",");
             _ = try out_stream.write("[");
-            for (row) |col, coli| {
+            for (row, 0..) |col, coli| {
                 if (coli != 0) _ = try out_stream.write(",");
                 try out_stream.print("[{d},{d}]", .{ col[0], col[1] });
             }

bench/algorithm/nbody/1.zig

@@ -22,7 +22,7 @@ const Planet = struct {
 fn advance(bodies: []Planet, dt: f64, steps: usize) void {
     var i: usize = 0;
     while (i < steps) : (i += 1) {
-        for (bodies) |*bi, j| {
+        for (bodies, 0..) |*bi, j| {
             var vx = bi.vx;
             var vy = bi.vy;
             var vz = bi.vz;
@@ -59,7 +59,7 @@ fn advance(bodies: []Planet, dt: f64, steps: usize) void {
 fn energy(bodies: []const Planet) f64 {
     var e: f64 = 0.0;
 
-    for (bodies) |bi, i| {
+    for (bodies, 0..) |bi, i| {
         e += 0.5 * (bi.vx * bi.vx + bi.vy * bi.vy + bi.vz * bi.vz) * bi.mass;
 
         for (bodies[i + 1 ..]) |bj| {

bench/algorithm/nbody/2.zig

@@ -41,7 +41,7 @@ fn offset_momentum(bodies: []Body) void {
 
 fn advance(bodies: []Body, dt: f64) void {
     @setFloatMode(.Optimized);
-    for (bodies[0..]) |*bi, i| {
+    for (bodies[0..], 0..) |*bi, i| {
         var vel = bi.vel;
         var mi = bi.mass;
         for (bodies[i + 1 ..]) |*bj| {
@@ -62,7 +62,7 @@ fn advance(bodies: []Body, dt: f64) void {
 fn energy(bodies: []const Body) f64 {
     @setFloatMode(.Optimized);
     var e: f64 = 0.0;
-    for (bodies) |bi, i| {
+    for (bodies, 0..) |bi, i| {
         e += 0.5 * length_sq(bi.vel) * bi.mass;
         for (bodies[i + 1 ..]) |bj| {
             e -= bi.mass * bj.mass / length(bi.pos - bj.pos);

bench/algorithm/spectral-norm/2-m.zig

@@ -7,7 +7,7 @@ fn vec1to4(f: f64) vec4 {
 
 fn runInParallel(tasks: []std.Thread, len: usize, comptime f: anytype, args: anytype) !void {
     const len_per_task = @divTrunc(len, tasks.len + 1);
-    for (tasks) |*task, i| {
+    for (tasks, 0..) |*task, i| {
         const first = len_per_task * i;
         const last = first + len_per_task;
         task.* = try std.Thread.spawn(.{}, f, .{ first, last } ++ args);
@@ -28,7 +28,7 @@ fn multAvGeneric(comptime transpose: bool, first: usize, dst: []vec4, src: []con
     for (dst) |*res| {
         var idx = if (transpose) baseIdx(ti - vec1to4(1)) else baseIdx(ti) + ti;
         var sum = vec1to4(0);
-        for (srcVals) |u, j| {
+        for (srcVals, 0..) |u, j| {
             sum += vec1to4(u) / idx;
             idx += ti + vec1to4(@intToFloat(f64, j + 1));
         }
@@ -59,7 +59,7 @@ fn aggregateResults(first: usize, last: usize, u: []const vec4, v: []const vec4,
     @setFloatMode(.Optimized);
     var vbv = vec1to4(0);
     var vv = vec1to4(0);
-    for (v[first..last]) |f, i| {
+    for (v[first..last], 0..) |f, i| {
         vbv += u[first + i] * f;
         vv += f * f;
     }

bench/algorithm/spectral-norm/2.zig

@@ -17,7 +17,7 @@ fn multAvGeneric(comptime transpose: bool, dst: []vec4, src: []const vec4) void
     for (dst) |*res| {
         var idx = if (transpose) baseIdx(ti - vec1to4(1)) else baseIdx(ti) + ti;
         var sum = vec1to4(0);
-        for (srcVals) |u, j| {
+        for (srcVals, 0..) |u, j| {
             sum += vec1to4(u) / idx;
             idx += ti + vec1to4(@intToFloat(f64, j + 1));
         }
@@ -44,7 +44,7 @@ fn aggregateResults(u: []const vec4, v: []const vec4) f64 {
     @setFloatMode(.Optimized);
     var vbv = vec1to4(0);
     var vv = vec1to4(0);
-    for (v) |f, i| {
+    for (v, 0..) |f, i| {
         vbv += u[i] * f;
         vv += f * f;
     }

bench/bench_zig.yaml

@@ -24,9 +24,6 @@ problems:
   - name: edigits
     source:
       - 1.zig
-  # - name: fasta
-  #   source:
-  #     - 1.zig
   - name: fannkuch-redux
     source:
       - 1.zig