Skip to content

Commit edc1393

Browse files
ahoppenahoppen
committed
[Async Refactoring] Rename 'success param/argument' to 'result' in fatalError messages
The 'success param/argument' is a terminology we use internally in the refactoring and not one we want to present to the user. Just name it 'result' instead.
1 parent 06219cd commit edc1393

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

‎lib/IDE/Refactoring.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6111,8 +6111,7 @@ class AsyncConverter : private SourceEntityWalker {
61116111

61126112
// fatalError(...)
61136113
OS << "fatalError" << tok::l_paren;
6114-
OS << "\"Expected non-nil success param '" << Name;
6115-
OS << "' for nil error\"";
6114+
OS << "\"Expected non-nil result '" << Name << "' for nil error\"";
61166115
OS << tok::r_paren << "\n";
61176116

61186117
// End guard.
@@ -6903,8 +6902,7 @@ class AsyncConverter : private SourceEntityWalker {
69036902
}
69046903
OS << ' ' << tok::kw_else << ' ' << tok::l_brace << '\n';
69056904
OS << "fatalError" << tok::l_paren;
6906-
OS << "\"Expected non-nil success argument '" << ArgName;
6907-
OS << "' for nil error\"";
6905+
OS << "\"Expected non-nil result '" << ArgName << "' for nil error\"";
69086906
OS << tok::r_paren << '\n';
69096907
OS << tok::r_brace << '\n';
69106908
}

‎test/refactoring/ConvertAsync/convert_async_wrapper.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func foo6(_ completion: @escaping (String?, Error?) -> Void) {}
8989
// FOO6-NEXT: return
9090
// FOO6-NEXT: }
9191
// FOO6-NEXT: guard let result = result else {
92-
// FOO6-NEXT: fatalError("Expected non-nil success param 'result' for nil error")
92+
// FOO6-NEXT: fatalError("Expected non-nil result 'result' for nil error")
9393
// FOO6-NEXT: }
9494
// FOO6-NEXT: continuation.resume(returning: result)
9595
// FOO6-NEXT: }
@@ -107,7 +107,7 @@ func foo7(_ completion: @escaping (String?, Int, Error?) -> Void) {}
107107
// FOO7-NEXT: return
108108
// FOO7-NEXT: }
109109
// FOO7-NEXT: guard let result1 = result1 else {
110-
// FOO7-NEXT: fatalError("Expected non-nil success param 'result1' for nil error")
110+
// FOO7-NEXT: fatalError("Expected non-nil result 'result1' for nil error")
111111
// FOO7-NEXT: }
112112
// FOO7-NEXT: continuation.resume(returning: (result1, result2))
113113
// FOO7-NEXT: }
@@ -125,10 +125,10 @@ func foo8(_ completion: @escaping (String?, Int?, Error?) -> Void) {}
125125
// FOO8-NEXT: return
126126
// FOO8-NEXT: }
127127
// FOO8-NEXT: guard let result1 = result1 else {
128-
// FOO8-NEXT: fatalError("Expected non-nil success param 'result1' for nil error")
128+
// FOO8-NEXT: fatalError("Expected non-nil result 'result1' for nil error")
129129
// FOO8-NEXT: }
130130
// FOO8-NEXT: guard let result2 = result2 else {
131-
// FOO8-NEXT: fatalError("Expected non-nil success param 'result2' for nil error")
131+
// FOO8-NEXT: fatalError("Expected non-nil result 'result2' for nil error")
132132
// FOO8-NEXT: }
133133
// FOO8-NEXT: continuation.resume(returning: (result1, result2))
134134
// FOO8-NEXT: }

‎test/refactoring/ConvertAsync/convert_to_continuation.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func testThrowingContinuationRelayingErrorAndResult(completionHandler: (Int?, Er
120120
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: continuation.resume(throwing: error)
121121
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: } else {
122122
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: guard let theValue1 = theValue else {
123-
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: fatalError("Expected non-nil success argument 'theValue1' for nil error")
123+
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: fatalError("Expected non-nil result 'theValue1' for nil error")
124124
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: }
125125
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: continuation.resume(returning: theValue1)
126126
// THROWING-CONTINUATION-RELAYING-ERROR-AND-RESULT-NEXT: }
@@ -141,7 +141,7 @@ func testThrowingContinuationRelayingErrorAndComplexResult(completionHandler: (I
141141
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: continuation.resume(throwing: error)
142142
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: } else {
143143
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: guard let result = theValue.map({ $0 + 1 }) else {
144-
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: fatalError("Expected non-nil success argument 'result' for nil error")
144+
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: fatalError("Expected non-nil result 'result' for nil error")
145145
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: }
146146
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: continuation.resume(returning: result)
147147
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-NEXT: }
@@ -162,10 +162,10 @@ func testThrowingContinuationRelayingErrorAndTwoComplexResults(completionHandler
162162
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: continuation.resume(throwing: error)
163163
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: } else {
164164
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: guard let result0 = theValue.map({ $0 + 1 }) else {
165-
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: fatalError("Expected non-nil success argument 'result0' for nil error")
165+
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: fatalError("Expected non-nil result 'result0' for nil error")
166166
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: }
167167
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: guard let result1 = theValue.map({ $0 + 2 }) else {
168-
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: fatalError("Expected non-nil success argument 'result1' for nil error")
168+
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: fatalError("Expected non-nil result 'result1' for nil error")
169169
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: }
170170
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: continuation.resume(returning: (result0, result1))
171171
// THROWING-CONTINUATION-RELAYING-ERROR-AND-TWO-COMPLEX-RESULTS-NEXT: }
@@ -186,7 +186,7 @@ func testThrowingContinuationRelayingErrorAndComplexResultWithTrailingClosure(co
186186
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: continuation.resume(throwing: error)
187187
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: } else {
188188
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: guard let result = theValue.map { $0 + 1 }.self else {
189-
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: fatalError("Expected non-nil success argument 'result' for nil error")
189+
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: fatalError("Expected non-nil result 'result' for nil error")
190190
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: }
191191
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: continuation.resume(returning: result)
192192
// THROWING-CONTINUATION-RELAYING-ERROR-AND-COMPLEX-RESULT-WITH-TRAILING-CLOSURE-NEXT: }
@@ -461,10 +461,10 @@ func testMultipleReturnValuesAndError(completion: (Int?, String?, Error?) -> Voi
461461
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: continuation.resume(throwing: error)
462462
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: } else {
463463
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: guard let first1 = first else {
464-
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: fatalError("Expected non-nil success argument 'first1' for nil error")
464+
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: fatalError("Expected non-nil result 'first1' for nil error")
465465
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: }
466466
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: guard let second1 = second else {
467-
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: fatalError("Expected non-nil success argument 'second1' for nil error")
467+
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: fatalError("Expected non-nil result 'second1' for nil error")
468468
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: }
469469
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: continuation.resume(returning: (first1, second1))
470470
// MULTIPLE-RETURN-VALUES-AND-ERROR-NEXT: }
@@ -496,7 +496,7 @@ func testMixedOptionalAnNonOptionaResults(completion: (Int?, String?, Error?) ->
496496
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: return try await withCheckedThrowingContinuation { continuation in
497497
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: withoutAsyncAlternativeThrowing { (theResult, error) in
498498
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: guard let theResult1 = theResult else {
499-
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: fatalError("Expected non-nil success argument 'theResult1' for nil error")
499+
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: fatalError("Expected non-nil result 'theResult1' for nil error")
500500
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: }
501501
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: continuation.resume(returning: (theResult1, "hi"))
502502
// MIXED-OPTIONAL-AND-NON-OPTIONAL-RESULT-NEXT: }
@@ -514,7 +514,7 @@ func testUseOptionalResultValueAfterCompletionHandlerCall(completion: (Int?, Str
514514
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: return try await withCheckedThrowingContinuation { continuation in
515515
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: withoutAsyncAlternativeThrowing { (theResult, error) in
516516
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: guard let theResult1 = theResult else {
517-
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: fatalError("Expected non-nil success argument 'theResult1' for nil error")
517+
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: fatalError("Expected non-nil result 'theResult1' for nil error")
518518
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: }
519519
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: continuation.resume(returning: (theResult1, "hi"))
520520
// USE-OPTIONAL-RESULT-AFTER-COMPLETION-HANDLER-CALL-NEXT: print(theResult.map { $0 + 1 } as Any)

0 commit comments

Comments
 (0)