---

swift-ci · swift-ci · commit be1ea5e2c3d9 · 2019-05-19T13:29:47.000-07:00
yaml --- r: 319391 b: refs/heads/master-rebranch c: 2c1f5c1 h: refs/heads/master i: 319389: 8cafcbf 319387: 688eabb 319383: c94299e 319375: f811e72 319359: f217dc4
diff --git a/[refs] b/[refs]
@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 15d5fc52cff8cbf09374f8e9ef1e91acc2815850
+refs/heads/master-rebranch: 2c1f5c108e8b233d0f7c842a01645b6dfb3fbdc4
diff --git a/branches/master-rebranch/stdlib/public/Darwin/Network/NWEndpoint.swift b/branches/master-rebranch/stdlib/public/Darwin/Network/NWEndpoint.swift
@@ -215,9 +215,7 @@ public struct IPv4Address: IPAddress, Hashable, CustomDebugStringConvertible {
 		if rawValue.count != MemoryLayout<in_addr>.size {
 			return nil
 		}
-		let v4 = rawValue.withUnsafeBytes { (ptr: UnsafePointer<in_addr>) -> in_addr in
-			return ptr.pointee
-		}
+		let v4 = rawValue.withUnsafeBytes { $0.load(as: in_addr.self) }
 		self.init(v4, interface)
 	}
 
@@ -381,9 +379,7 @@ public struct IPv6Address: IPAddress, Hashable, CustomDebugStringConvertible {
 		if rawValue.count != MemoryLayout<in6_addr>.size {
 			return nil
 		}
-		let v6 = rawValue.withUnsafeBytes { (ptr: UnsafePointer<in6_addr>) -> in6_addr in
-			return ptr.pointee
-		}
+		let v6 = rawValue.withUnsafeBytes { $0.load(as: in6_addr.self) }
 		self.init(v6, interface)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,7 @@ public struct IPv4Address: IPAddress, Hashable, CustomDebugStringConvertible {`
`215`	`215`	`if rawValue.count != MemoryLayout<in_addr>.size {`
`216`	`216`	`return nil`
`217`	`217`	`}`
`218`		`- let v4 = rawValue.withUnsafeBytes { (ptr: UnsafePointer<in_addr>) -> in_addr in`
`219`		`- return ptr.pointee`
`220`		`- }`
	`218`	`+ let v4 = rawValue.withUnsafeBytes { $0.load(as: in_addr.self) }`
`221`	`219`	`self.init(v4, interface)`
`222`	`220`	`}`
`223`	`221`
`@@ -381,9 +379,7 @@ public struct IPv6Address: IPAddress, Hashable, CustomDebugStringConvertible {`
`381`	`379`	`if rawValue.count != MemoryLayout<in6_addr>.size {`
`382`	`380`	`return nil`
`383`	`381`	`}`
`384`		`- let v6 = rawValue.withUnsafeBytes { (ptr: UnsafePointer<in6_addr>) -> in6_addr in`
`385`		`- return ptr.pointee`
`386`		`- }`
	`382`	`+ let v6 = rawValue.withUnsafeBytes { $0.load(as: in6_addr.self) }`
`387`	`383`	`self.init(v6, interface)`
`388`	`384`	`}`
`389`	`385`