Skip to content

Commit 729c6d3

Browse files
committed
Use Result.get() to reduce boilerplate
1 parent 014704f commit 729c6d3

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

Sources/PackageLoading/ManifestLoader.swift

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -568,13 +568,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
568568
delegateQueue: delegateQueue
569569
) { result in
570570
do {
571-
let evaluationResult : EvaluationResult
572-
switch result {
573-
case .success(let result):
574-
evaluationResult = result
575-
case .failure(let error):
576-
return completion(.failure(error))
577-
}
571+
let evaluationResult = try result.get()
578572
// only cache successfully parsed manifests
579573
let parseManifest = try self.parseManifest(
580574
evaluationResult,
@@ -820,14 +814,8 @@ public final class ManifestLoader: ManifestLoaderProtocol {
820814
// Compile the manifest.
821815
Process.popen(arguments: cmd, environment: toolchain.swiftCompilerEnvironment) { result in
822816
let compilerResult : ProcessResult
823-
switch result {
824-
case .success(let result):
825-
compilerResult = result
826-
case .failure(let error):
827-
return completion(.failure(error))
828-
}
829-
830817
do {
818+
compilerResult = try result.get()
831819
evaluationResult.compilerOutput = try (compilerResult.utf8Output() + compilerResult.utf8stderrOutput()).spm_chuzzle()
832820
} catch {
833821
return completion(.failure(error))
@@ -882,15 +870,8 @@ public final class ManifestLoader: ManifestLoaderProtocol {
882870
defer { cleanupTmpDir(tmpDir) }
883871
fclose(jsonOutputFileDesc)
884872

885-
let runResult : ProcessResult
886-
switch result {
887-
case .success(let result):
888-
runResult = result
889-
case .failure(let error):
890-
return completion(.failure(error))
891-
}
892-
893873
do {
874+
let runResult = try result.get()
894875
if let runOutput = try (runResult.utf8Output() + runResult.utf8stderrOutput()).spm_chuzzle() {
895876
// Append the runtime output to any compiler output we've received.
896877
evaluationResult.compilerOutput = (evaluationResult.compilerOutput ?? "") + runOutput

0 commit comments

Comments
 (0)