Merge pull request swiftlang#2877 from compnerd/deprecation

compnerd · web-flow · commit 0ec111dea940 · 2020-08-19T11:34:26.000-07:00
PackageLoading: use `compactMap` instead of `flatMap` (NFC)
diff --git a/Sources/PackageLoading/PackageBuilder.swift b/Sources/PackageLoading/PackageBuilder.swift
@@ -845,7 +845,7 @@ public final class PackageBuilder {
             conditions.append(condition)
         }
 
-        if let platforms = condition?.platformNames.flatMap({ platformRegistry.platformByName[$0] }), !platforms.isEmpty {
+        if let platforms = condition?.platformNames.compactMap({ platformRegistry.platformByName[$0] }), !platforms.isEmpty {
             let condition = PlatformsCondition(platforms: platforms)
             conditions.append(condition)
         }

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ public final class PackageBuilder {`
`845`	`845`	`conditions.append(condition)`
`846`	`846`	`}`
`847`	`847`
`848`		`- if let platforms = condition?.platformNames.flatMap({ platformRegistry.platformByName[$0] }), !platforms.isEmpty {`
	`848`	`+ if let platforms = condition?.platformNames.compactMap({ platformRegistry.platformByName[$0] }), !platforms.isEmpty {`
`849`	`849`	`let condition = PlatformsCondition(platforms: platforms)`
`850`	`850`	`conditions.append(condition)`
`851`	`851`	`}`