From 3640c682a2ed8a0f554224936a3c634215543ffe Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Sat, 1 Feb 2020 11:32:53 +0100 Subject: [PATCH] Run `zig fmt` --- lib/std/c/parse.zig | 1 - lib/std/c/tokenizer.zig | 2 +- lib/std/hash/benchmark.zig | 4 ++-- lib/std/os/uefi.zig | 3 ++- lib/std/os/windows/bits.zig | 20 +++++++------------- lib/std/zig/perf_test.zig | 2 +- src-self-hosted/dep_tokenizer.zig | 2 +- src-self-hosted/link.zig | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/lib/std/c/parse.zig b/lib/std/c/parse.zig index dd646e06d6..4c6c2fb462 100644 --- a/lib/std/c/parse.zig +++ b/lib/std/c/parse.zig @@ -1428,4 +1428,3 @@ const Parser = struct { }); } }; - diff --git a/lib/std/c/tokenizer.zig b/lib/std/c/tokenizer.zig index a641529502..bf8bb2b8c7 100644 --- a/lib/std/c/tokenizer.zig +++ b/lib/std/c/tokenizer.zig @@ -631,7 +631,7 @@ pub const Tokenizer = struct { }, .BackSlashCr => switch (c) { '\n' => { - state = .Start; + state = .Start; }, else => { result.id = .Invalid; diff --git a/lib/std/hash/benchmark.zig b/lib/std/hash/benchmark.zig index c792013e06..ed1bab9d87 100644 --- a/lib/std/hash/benchmark.zig +++ b/lib/std/hash/benchmark.zig @@ -250,13 +250,13 @@ pub fn main() !void { if (H.has_iterative_api) { prng.seed(seed); const result = try benchmarkHash(H, count); - try stdout.print(" iterative: {:4} MiB/s [{x:0<16}]\n", .{result.throughput / (1 * MiB), result.hash}); + try stdout.print(" iterative: {:4} MiB/s [{x:0<16}]\n", .{ result.throughput / (1 * MiB), result.hash }); } if (!test_iterative_only) { prng.seed(seed); const result_small = try benchmarkHashSmallKeys(H, key_size, count); - try stdout.print(" small keys: {:4} MiB/s [{x:0<16}]\n", .{result_small.throughput / (1 * MiB), result_small.hash}); + try stdout.print(" small keys: {:4} MiB/s [{x:0<16}]\n", .{ result_small.throughput / (1 * MiB), result_small.hash }); } } } diff --git a/lib/std/os/uefi.zig b/lib/std/os/uefi.zig index 1095706c97..81d13ac1c3 100644 --- a/lib/std/os/uefi.zig +++ b/lib/std/os/uefi.zig @@ -40,7 +40,8 @@ pub const Guid = extern struct { self.time_mid, self.time_high_and_version, self.clock_seq_high_and_reserved, - self.clock_seq_low, self.node, + self.clock_seq_low, + self.node, }); } else { @compileError("Unknown format character: '" ++ f ++ "'"); diff --git a/lib/std/os/windows/bits.zig b/lib/std/os/windows/bits.zig index 756c8e7f12..ec4f231ed0 100644 --- a/lib/std/os/windows/bits.zig +++ b/lib/std/os/windows/bits.zig @@ -928,10 +928,7 @@ pub usingnamespace switch (builtin.arch) { SegSs: DWORD, ExtendedRegisters: [512]BYTE, - pub fn getRegs(ctx: *const CONTEXT) struct { - bp: usize, - ip: usize, - } { + pub fn getRegs(ctx: *const CONTEXT) struct { bp: usize, ip: usize } { return .{ .bp = ctx.Ebp, .ip = ctx.Eip }; } }; @@ -1034,10 +1031,7 @@ pub usingnamespace switch (builtin.arch) { LastExceptionToRip: DWORD64, LastExceptionFromRip: DWORD64, - pub fn getRegs(ctx: *const CONTEXT) struct { - bp: usize, - ip: usize, - } { + pub fn getRegs(ctx: *const CONTEXT) struct { bp: usize, ip: usize } { return .{ .bp = ctx.Rbp, .ip = ctx.Rip }; } }; @@ -1105,11 +1099,11 @@ pub usingnamespace switch (builtin.arch) { Wcr: [2]DWORD, Wvr: [2]DWORD64, - pub fn getRegs(ctx: *const CONTEXT) struct { - bp: usize, - ip: usize, - } { - return .{ .bp = ctx.DUMMYUNIONNAME.DUMMYSTRUCTNAME.Fp, .ip = ctx.Pc }; + pub fn getRegs(ctx: *const CONTEXT) struct { bp: usize, ip: usize } { + return .{ + .bp = ctx.DUMMYUNIONNAME.DUMMYSTRUCTNAME.Fp, + .ip = ctx.Pc, + }; } }; diff --git a/lib/std/zig/perf_test.zig b/lib/std/zig/perf_test.zig index fe9d35fa43..070d9c3bc9 100644 --- a/lib/std/zig/perf_test.zig +++ b/lib/std/zig/perf_test.zig @@ -25,7 +25,7 @@ pub fn main() !void { var stdout_file = std.io.getStdOut(); const stdout = &stdout_file.outStream().stream; - try stdout.print("{:.3} MiB/s, {} KiB used \n", .{mb_per_sec, memory_used / 1024}); + try stdout.print("{:.3} MiB/s, {} KiB used \n", .{ mb_per_sec, memory_used / 1024 }); } fn testOnce() usize { diff --git a/src-self-hosted/dep_tokenizer.zig b/src-self-hosted/dep_tokenizer.zig index c5b0f0cd14..9a13faa5f2 100644 --- a/src-self-hosted/dep_tokenizer.zig +++ b/src-self-hosted/dep_tokenizer.zig @@ -894,7 +894,7 @@ fn printSection(out: var, label: []const u8, bytes: []const u8) !void { fn printLabel(out: var, label: []const u8, bytes: []const u8) !void { var buf: [80]u8 = undefined; - var text = try std.fmt.bufPrint(buf[0..], "{} {} bytes ", .{label, bytes.len}); + var text = try std.fmt.bufPrint(buf[0..], "{} {} bytes ", .{ label, bytes.len }); try out.write(text); var i: usize = text.len; const end = 79; diff --git a/src-self-hosted/link.zig b/src-self-hosted/link.zig index efb83710d9..96e18514ea 100644 --- a/src-self-hosted/link.zig +++ b/src-self-hosted/link.zig @@ -105,7 +105,7 @@ extern fn ZigLLDLink( context: *c_void, ) bool; -extern fn linkDiagCallback(context: *c_void, ptr: [*]const u8, len: usize) void { +fn linkDiagCallback(context: *c_void, ptr: [*]const u8, len: usize) callconv(.C) void { const ctx = @ptrCast(*Context, @alignCast(@alignOf(Context), context)); ctx.link_err = linkDiagCallbackErrorable(ctx, ptr[0..len]); }