Skip to content

Commit 9db508a

Browse files
committed
Merge pull request #2882 from practicalswift/a-vs-an-ii
[gardening] Fix "a" vs. "an" issues.
2 parents 830a815 + ccdea7c commit 9db508a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2143,7 +2143,7 @@ ERROR(closure_implicit_capture_mutating_self,none,
21432143
"closure cannot implicitly capture a mutating self parameter",
21442144
())
21452145
ERROR(nested_function_with_implicit_capture_argument,none,
2146-
"nested function with %select{a |}0implicitly captured inout "
2146+
"nested function with %select{an |}0implicitly captured inout "
21472147
"parameter%select{|s}0 can only be used as a @noescape argument", (bool))
21482148
ERROR(nested_function_escaping_inout_capture,none,
21492149
"nested function cannot capture inout parameter and escape", ())

test/Sema/diag_invalid_inout_captures.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func remember(line: inout String) -> () -> Void {
2020
line = "I'm your man"
2121
}
2222
no_escape(despite_our_estrangement)
23-
do_escape(despite_our_estrangement) // expected-error {{nested function with a implicitly captured inout parameter can only be used as a @noescape argument}}
23+
do_escape(despite_our_estrangement) // expected-error {{nested function with an implicitly captured inout parameter can only be used as a @noescape argument}}
2424

2525
return despite_our_estrangement // expected-error {{nested function cannot capture inout parameter and escape}}
2626
}

utils/swift_build_support/swift_build_support/debug.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def print_xcodebuild_versions(file=sys.stdout):
3030
version = shell.capture(
3131
['xcodebuild', '-version'], dry_run=False, echo=False).rstrip()
3232
# Allow non-zero exit codes. Under certain obscure circumstances
33-
# xcodebuild can exit with an non-zero exit code even when the SDK is
33+
# xcodebuild can exit with a non-zero exit code even when the SDK is
3434
# usable.
3535
sdks = shell.capture(
3636
['xcodebuild', '-version', '-sdk'], dry_run=False, echo=False,

0 commit comments

Comments
 (0)