Merge branch 'master' into zen_stdlib

1 files changed, 13 insertions, 15 deletions

diff --git a/std/net.zig b/std/net.zig
index 8e1b8d97b2..8c1aeb92d7 100644
--- a/std/net.zig
+++ b/std/net.zig
@@ -19,9 +19,9 @@ pub const Address = struct {
     os_addr: OsAddress,
 
     pub fn initIp4(ip4: u32, port: u16) Address {
-        return Address {
-            .os_addr = posix.sockaddr {
-                .in = posix.sockaddr_in {
+        return Address{
+            .os_addr = posix.sockaddr{
+                .in = posix.sockaddr_in{
                     .family = posix.AF_INET,
                     .port = std.mem.endianSwapIfLe(u16, port),
                     .addr = ip4,
@@ -31,11 +31,11 @@ pub const Address = struct {
         };
     }
 
-    pub fn initIp6(ip6: &const Ip6Addr, port: u16) Address {
-        return Address {
+    pub fn initIp6(ip6: *const Ip6Addr, port: u16) Address {
+        return Address{
             .family = posix.AF_INET6,
-            .os_addr = posix.sockaddr {
-                .in6 = posix.sockaddr_in6 {
+            .os_addr = posix.sockaddr{
+                .in6 = posix.sockaddr_in6{
                     .family = posix.AF_INET6,
                     .port = std.mem.endianSwapIfLe(u16, port),
                     .flowinfo = 0,
@@ -46,17 +46,15 @@ pub const Address = struct {
         };
     }
 
-    pub fn initPosix(addr: &const posix.sockaddr) Address {
-        return Address {
-            .os_addr = *addr,
-        };
+    pub fn initPosix(addr: *const posix.sockaddr) Address {
+        return Address{ .os_addr = addr.* };
     }
 
-    pub fn format(self: &const Address, out_stream: var) !void {
+    pub fn format(self: *const Address, out_stream: var) !void {
         switch (self.os_addr.in.family) {
             posix.AF_INET => {
                 const native_endian_port = std.mem.endianSwapIfLe(u16, self.os_addr.in.port);
-                const bytes = ([]const u8)((&self.os_addr.in.addr)[0..1]);
+                const bytes = ([]const u8)((*self.os_addr.in.addr)[0..1]);
                 try out_stream.print("{}.{}.{}.{}:{}", bytes[0], bytes[1], bytes[2], bytes[3], native_endian_port);
             },
             posix.AF_INET6 => {
@@ -70,7 +68,7 @@ pub const Address = struct {
 
 pub fn parseIp4(buf: []const u8) !u32 {
     var result: u32 = undefined;
-    const out_ptr = ([]u8)((&result)[0..1]);
+    const out_ptr = @sliceToBytes((*[1]u32)(&result)[0..]);
 
     var x: u8 = 0;
     var index: u8 = 0;
@@ -98,7 +96,7 @@ pub fn parseIp4(buf: []const u8) !u32 {
             }
         } else {
             return error.InvalidCharacter;
-        } 
+        }
     }
     if (index == 3 and saw_any_digits) {
         out_ptr[index] = x;