diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-08-04 23:04:20 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-08-04 23:04:20 -0700 |
| commit | d159ba9295b331663a62438673f3543c35fca136 (patch) | |
| tree | 87f19fb904d8706b6b8368b849be44f1ce0e26bd /lib/std | |
| parent | f23fb3087befc041161498a086bac2a92acea6cb (diff) | |
| download | zig-d159ba9295b331663a62438673f3543c35fca136.tar.gz zig-d159ba9295b331663a62438673f3543c35fca136.zip | |
zig fmt
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/json.zig | 2 | ||||
| -rw-r--r-- | lib/std/mem.zig | 2 | ||||
| -rw-r--r-- | lib/std/net.zig | 19 | ||||
| -rw-r--r-- | lib/std/os/bits/windows.zig | 2 | ||||
| -rw-r--r-- | lib/std/os/windows.zig | 2 | ||||
| -rw-r--r-- | lib/std/special/compiler_rt/floatditf.zig | 2 |
6 files changed, 14 insertions, 15 deletions
diff --git a/lib/std/json.zig b/lib/std/json.zig index 3a94ceec37..59c765ac42 100644 --- a/lib/std/json.zig +++ b/lib/std/json.zig @@ -1742,7 +1742,7 @@ test "parse into tagged union" { A: struct { x: u32 }, B: struct { y: u32 }, }; - testing.expectEqual(T{ .B = .{.y = 42} }, try parse(T, &TokenStream.init("{\"y\":42}"), ParseOptions{})); + testing.expectEqual(T{ .B = .{ .y = 42 } }, try parse(T, &TokenStream.init("{\"y\":42}"), ParseOptions{})); } } diff --git a/lib/std/mem.zig b/lib/std/mem.zig index 0d6d7c118a..2fb364b340 100644 --- a/lib/std/mem.zig +++ b/lib/std/mem.zig @@ -2038,7 +2038,7 @@ pub fn replace(comptime T: type, input: []const T, needle: []const T, replacemen var replacements: usize = 0; while (slide < input.len) { if (mem.indexOf(T, input[slide..], needle) == @as(usize, 0)) { - mem.copy(T, output[i..i + replacement.len], replacement); + mem.copy(T, output[i .. i + replacement.len], replacement); i += replacement.len; slide += needle.len; replacements += 1; diff --git a/lib/std/net.zig b/lib/std/net.zig index 514e48e0a7..0cd34376e1 100644 --- a/lib/std/net.zig +++ b/lib/std/net.zig @@ -77,23 +77,23 @@ pub const Address = extern union { } pub fn parseIp6(buf: []const u8, port: u16) !Address { - return Address{.in6 = try Ip6Address.parse(buf, port) }; + return Address{ .in6 = try Ip6Address.parse(buf, port) }; } pub fn resolveIp6(buf: []const u8, port: u16) !Address { - return Address{.in6 = try Ip6Address.resolve(buf, port) }; + return Address{ .in6 = try Ip6Address.resolve(buf, port) }; } pub fn parseIp4(buf: []const u8, port: u16) !Address { - return Address {.in = try Ip4Address.parse(buf, port) }; + return Address{ .in = try Ip4Address.parse(buf, port) }; } pub fn initIp4(addr: [4]u8, port: u16) Address { - return Address{.in = Ip4Address.init(addr, port) }; + return Address{ .in = Ip4Address.init(addr, port) }; } pub fn initIp6(addr: [16]u8, port: u16, flowinfo: u32, scope_id: u32) Address { - return Address{.in6 = Ip6Address.init(addr, port, flowinfo, scope_id) }; + return Address{ .in6 = Ip6Address.init(addr, port, flowinfo, scope_id) }; } pub fn initUnix(path: []const u8) !Address { @@ -136,8 +136,8 @@ pub const Address = extern union { /// on the address family. pub fn initPosix(addr: *align(4) const os.sockaddr) Address { switch (addr.family) { - os.AF_INET => return Address{ .in = Ip4Address{ .sa = @ptrCast(*const os.sockaddr_in, addr).*} }, - os.AF_INET6 => return Address{ .in6 = Ip6Address{ .sa = @ptrCast(*const os.sockaddr_in6, addr).*} }, + os.AF_INET => return Address{ .in = Ip4Address{ .sa = @ptrCast(*const os.sockaddr_in, addr).* } }, + os.AF_INET6 => return Address{ .in6 = Ip6Address{ .sa = @ptrCast(*const os.sockaddr_in6, addr).* } }, else => unreachable, } } @@ -193,7 +193,7 @@ pub const Ip4Address = extern struct { .sa = .{ .port = mem.nativeToBig(u16, port), .addr = undefined, - } + }, }; const out_ptr = mem.sliceAsBytes(@as(*[1]u32, &result.sa.addr)[0..]); @@ -240,7 +240,7 @@ pub const Ip4Address = extern struct { } pub fn init(addr: [4]u8, port: u16) Ip4Address { - return Ip4Address { + return Ip4Address{ .sa = os.sockaddr_in{ .port = mem.nativeToBig(u16, port), .addr = @ptrCast(*align(1) const u32, &addr).*, @@ -598,7 +598,6 @@ pub const Ip6Address = extern struct { } }; - pub fn connectUnixSocket(path: []const u8) !fs.File { const opt_non_block = if (std.io.is_async) os.SOCK_NONBLOCK else 0; const sockfd = try os.socket( diff --git a/lib/std/os/bits/windows.zig b/lib/std/os/bits/windows.zig index 53a590ff1e..5316a048cc 100644 --- a/lib/std/os/bits/windows.zig +++ b/lib/std/os/bits/windows.zig @@ -261,4 +261,4 @@ pub const O_LARGEFILE = 0; pub const O_NOATIME = 0o1000000; pub const O_PATH = 0o10000000; pub const O_TMPFILE = 0o20200000; -pub const O_NDELAY = O_NONBLOCK;
\ No newline at end of file +pub const O_NDELAY = O_NONBLOCK; diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig index bf41d0ae93..2b3dc29b04 100644 --- a/lib/std/os/windows.zig +++ b/lib/std/os/windows.zig @@ -51,7 +51,7 @@ pub const OpenFileOptions = struct { open_dir: bool = false, /// If false, tries to open path as a reparse point without dereferencing it. /// Defaults to true. - follow_symlinks: bool = true, + follow_symlinks: bool = true, }; /// TODO when share_access_nonblocking is false, this implementation uses diff --git a/lib/std/special/compiler_rt/floatditf.zig b/lib/std/special/compiler_rt/floatditf.zig index 35264f27e9..581a0e0532 100644 --- a/lib/std/special/compiler_rt/floatditf.zig +++ b/lib/std/special/compiler_rt/floatditf.zig @@ -18,7 +18,7 @@ pub fn __floatditf(arg: i64) callconv(.C) f128 { var aAbs = @bitCast(u64, arg); if (arg < 0) { sign = 1 << 127; - aAbs = ~@bitCast(u64, arg)+ 1; + aAbs = ~@bitCast(u64, arg) + 1; } // Exponent of (fp_t)a is the width of abs(a). |
