From 7e75e1075e14a124706bf5f22244ca6b6e814fdb Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 15 Aug 2019 18:19:04 -0400 Subject: [PATCH] zig fmt --- std/event/loop.zig | 1 - std/hash.zig | 1 - std/os/darwin.zig | 2 +- std/os/freebsd.zig | 2 +- std/os/windows.zig | 1 - std/os/windows/bits.zig | 4 ++-- std/os/windows/ntdll.zig | 10 ++++++++-- std/os/windows/status.zig | 4 ++-- std/rb.zig | 1 - test/stage1/behavior/muladd.zig | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/std/event/loop.zig b/std/event/loop.zig index 827fbf3dd..0e02addcb 100644 --- a/std/event/loop.zig +++ b/std/event/loop.zig @@ -627,7 +627,6 @@ pub const Loop = struct { } } - /// call finishOneEvent when done pub fn beginOneEvent(self: *Loop) void { _ = @atomicRmw(usize, &self.pending_event_count, AtomicRmwOp.Add, 1, AtomicOrder.SeqCst); diff --git a/std/hash.zig b/std/hash.zig index 648f34b11..ab3a0ea8f 100644 --- a/std/hash.zig +++ b/std/hash.zig @@ -20,7 +20,6 @@ pub const SipHash128 = siphash.SipHash128; pub const murmur = @import("hash/murmur.zig"); pub const Murmur2_32 = murmur.Murmur2_32; - pub const Murmur2_64 = murmur.Murmur2_64; pub const Murmur3_32 = murmur.Murmur3_32; diff --git a/std/os/darwin.zig b/std/os/darwin.zig index c2b6801e2..0adf71aff 100644 --- a/std/os/darwin.zig +++ b/std/os/darwin.zig @@ -5,4 +5,4 @@ pub const is_the_target = switch (builtin.os) { else => false, }; pub usingnamespace std.c; -pub usingnamespace @import("bits.zig"); \ No newline at end of file +pub usingnamespace @import("bits.zig"); diff --git a/std/os/freebsd.zig b/std/os/freebsd.zig index e9efe6492..ddbf98f2b 100644 --- a/std/os/freebsd.zig +++ b/std/os/freebsd.zig @@ -2,4 +2,4 @@ const std = @import("../std.zig"); const builtin = @import("builtin"); pub const is_the_target = builtin.os == .freebsd; pub usingnamespace std.c; -pub usingnamespace @import("bits.zig"); \ No newline at end of file +pub usingnamespace @import("bits.zig"); diff --git a/std/os/windows.zig b/std/os/windows.zig index 4c6bfe70d..7c1761a4b 100644 --- a/std/os/windows.zig +++ b/std/os/windows.zig @@ -875,7 +875,6 @@ pub fn unexpectedError(err: DWORD) std.os.UnexpectedError { return error.Unexpected; } - /// Call this when you made a windows NtDll call /// and you get an unexpected status. pub fn unexpectedStatus(status: NTSTATUS) std.os.UnexpectedError { diff --git a/std/os/windows/bits.zig b/std/os/windows/bits.zig index 79697995f..ddfdd27e1 100644 --- a/std/os/windows/bits.zig +++ b/std/os/windows/bits.zig @@ -209,7 +209,7 @@ pub const FILE_INFORMATION_CLASS = extern enum { FileLinkInformationExBypassAccessCheck, FileStorageReserveIdInformation, FileCaseSensitiveInformationForceAccessCheck, - FileMaximumInformation + FileMaximumInformation, }; pub const OVERLAPPED = extern struct { @@ -731,4 +731,4 @@ pub const UNICODE_STRING = extern struct { Length: USHORT, MaximumLength: USHORT, Buffer: [*]WCHAR, -}; \ No newline at end of file +}; diff --git a/std/os/windows/ntdll.zig b/std/os/windows/ntdll.zig index 746403fa6..bfc98aba8 100644 --- a/std/os/windows/ntdll.zig +++ b/std/os/windows/ntdll.zig @@ -1,7 +1,13 @@ usingnamespace @import("bits.zig"); pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: **c_void, BackTraceHash: ?*DWORD) WORD; -pub extern "NtDll" stdcallcc fn NtQueryInformationFile(FileHandle: HANDLE, IoStatusBlock: *IO_STATUS_BLOCK, FileInformation: *c_void, Length: ULONG, FileInformationClass: FILE_INFORMATION_CLASS,) NTSTATUS; +pub extern "NtDll" stdcallcc fn NtQueryInformationFile( + FileHandle: HANDLE, + IoStatusBlock: *IO_STATUS_BLOCK, + FileInformation: *c_void, + Length: ULONG, + FileInformationClass: FILE_INFORMATION_CLASS, +) NTSTATUS; pub extern "NtDll" stdcallcc fn NtCreateFile( FileHandle: *HANDLE, DesiredAccess: ACCESS_MASK, @@ -15,4 +21,4 @@ pub extern "NtDll" stdcallcc fn NtCreateFile( EaBuffer: *c_void, EaLength: ULONG, ) NTSTATUS; -pub extern "NtDll" stdcallcc fn NtClose(Handle: HANDLE) NTSTATUS; \ No newline at end of file +pub extern "NtDll" stdcallcc fn NtClose(Handle: HANDLE) NTSTATUS; diff --git a/std/os/windows/status.zig b/std/os/windows/status.zig index 668a736e9..b9fd2b495 100644 --- a/std/os/windows/status.zig +++ b/std/os/windows/status.zig @@ -1,5 +1,5 @@ -/// The operation completed successfully. +/// The operation completed successfully. pub const SUCCESS = 0x00000000; /// The data was too large to fit into the specified buffer. -pub const BUFFER_OVERFLOW = 0x80000005; \ No newline at end of file +pub const BUFFER_OVERFLOW = 0x80000005; diff --git a/std/rb.zig b/std/rb.zig index 0b8495054..3f2a2d5bb 100644 --- a/std/rb.zig +++ b/std/rb.zig @@ -549,7 +549,6 @@ test "rb" { } } - test "inserting and looking up" { var tree: Tree = undefined; tree.init(testCompare); diff --git a/test/stage1/behavior/muladd.zig b/test/stage1/behavior/muladd.zig index 143e6a93e..d507f503f 100644 --- a/test/stage1/behavior/muladd.zig +++ b/test/stage1/behavior/muladd.zig @@ -31,4 +31,4 @@ fn testMulAdd() void { // var c: f128 = 6.25; // expect(@mulAdd(f128, a, b, c) == 20); //} -} \ No newline at end of file +}