@@ -568,13 +568,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
568
568
delegateQueue: delegateQueue
569
569
) { result in
570
570
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 ( )
578
572
// only cache successfully parsed manifests
579
573
let parseManifest = try self . parseManifest (
580
574
evaluationResult,
@@ -820,14 +814,8 @@ public final class ManifestLoader: ManifestLoaderProtocol {
820
814
// Compile the manifest.
821
815
Process . popen ( arguments: cmd, environment: toolchain. swiftCompilerEnvironment) { result in
822
816
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
-
830
817
do {
818
+ compilerResult = try result. get ( )
831
819
evaluationResult. compilerOutput = try ( compilerResult. utf8Output ( ) + compilerResult. utf8stderrOutput ( ) ) . spm_chuzzle ( )
832
820
} catch {
833
821
return completion ( . failure( error) )
@@ -882,15 +870,8 @@ public final class ManifestLoader: ManifestLoaderProtocol {
882
870
defer { cleanupTmpDir ( tmpDir) }
883
871
fclose ( jsonOutputFileDesc)
884
872
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
-
893
873
do {
874
+ let runResult = try result. get ( )
894
875
if let runOutput = try ( runResult. utf8Output ( ) + runResult. utf8stderrOutput ( ) ) . spm_chuzzle ( ) {
895
876
// Append the runtime output to any compiler output we've received.
896
877
evaluationResult. compilerOutput = ( evaluationResult. compilerOutput ?? " " ) + runOutput
0 commit comments