Skip to content

Commit dfbf5b6

Browse files
jsorefjsoref
authored
Spelling attr (#42552)
* spelling: because Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: framework Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: instance Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: nonexistent Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: rewriter Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: versioned Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
1 parent 5888053 commit dfbf5b6

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎test/attr/attr_backDeploy.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public func trailingWildcardFunc() {}
283283
public func embeddedWildcardFunc() {}
284284

285285
@_backDeploy(before: _myProject 3.0) // expected-error {{reference to undefined version '3.0' for availability macro '_myProject'}}
286-
public func macroVersionned() {}
286+
public func macroVersioned() {}
287287

288288
@_backDeploy(before: _myProject) // expected-error {{reference to undefined version '0' for availability macro '_myProject'}}
289289
public func missingMacroVersion() {}
@@ -295,11 +295,11 @@ public func unknownMacroMissingVersion() {}
295295

296296
@_backDeploy(before: _unknownMacro 1.0) // expected-warning {{unknown platform '_unknownMacro' for attribute '@_backDeploy'}}
297297
// expected-error@-1 {{expected at least one platform version in '@_backDeploy' attribute}}
298-
public func unknownMacroVersionned() {}
298+
public func unknownMacroVersioned() {}
299299

300300
@available(macOS 11.0, *)
301301
@_backDeploy(before: _unknownMacro 1.0, _myProject 2.0) // expected-warning {{unknown platform '_unknownMacro' for attribute '@_backDeploy'}}
302-
public func knownAndUnknownMacroVersionned() {}
302+
public func knownAndUnknownMacroVersioned() {}
303303

304304
@_backDeploy() // expected-error {{expected 'before:' in '@_backDeploy' attribute}}
305305
// expected-error@-1 {{expected at least one platform version in '@_backDeploy' attribute}}

‎test/attr/attr_backDeploy_evolution.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// RUN: %empty-directory(%t/SDK_ABI)
3838
// RUN: %empty-directory(%t/SDK_BD)
3939

40-
// ---- (1) Build famework with BackDeploy 2.0 in the past
40+
// ---- (1) Build framework with BackDeploy 2.0 in the past
4141
// RUN: mkdir -p %t/SDK_ABI/Frameworks/BackDeployHelper.framework/Modules/BackDeployHelper.swiftmodule
4242
// RUN: %target-build-swift-dylib(%t/SDK_ABI/Frameworks/BackDeployHelper.framework/BackDeployHelper) \
4343
// RUN: -emit-module-path %t/SDK_ABI/Frameworks/BackDeployHelper.framework/Modules/BackDeployHelper.swiftmodule/%module-target-triple.swiftmodule \
@@ -64,7 +64,7 @@
6464
// RUN: %target-codesign %t/test_ABI
6565
// RUN: %target-run %t/test_ABI %t/SDK_ABI/Frameworks/BackDeployHelper.framework/BackDeployHelper | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-ABI %s
6666

67-
// ---- (4) Build famework with BackDeploy 2.0 in the future
67+
// ---- (4) Build framework with BackDeploy 2.0 in the future
6868
// RUN: mkdir -p %t/SDK_BD/Frameworks/BackDeployHelper.framework/Modules/BackDeployHelper.swiftmodule
6969
// RUN: %target-build-swift-dylib(%t/SDK_BD/Frameworks/BackDeployHelper.framework/BackDeployHelper) \
7070
// RUN: -emit-module-path %t/SDK_BD/Frameworks/BackDeployHelper.framework/Modules/BackDeployHelper.swiftmodule/%module-target-triple.swiftmodule \
@@ -91,7 +91,7 @@
9191
// RUN: %target-codesign %t/test_BD
9292
// RUN: %target-run %t/test_BD %t/SDK_BD/Frameworks/BackDeployHelper.framework/BackDeployHelper | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-BD %s
9393

94-
// ---- (7) Re-build famework with the back deployed APIs stripped
94+
// ---- (7) Re-build framework with the back deployed APIs stripped
9595
// RUN: mkdir -p %t/SDK_BD/Frameworks/BackDeployHelper.framework/Modules/BackDeployHelper.swiftmodule
9696
// RUN: %target-build-swift-dylib(%t/SDK_BD/Frameworks/BackDeployHelper.framework/BackDeployHelper) \
9797
// RUN: -emit-module-path %t/SDK_BD/Frameworks/BackDeployHelper.framework/Modules/BackDeployHelper.swiftmodule/%module-target-triple.swiftmodule \

‎test/attr/attr_dynamic_member_lookup.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ func test_infinite_self_recursion() {
763763
// expected-error@-1 {{value of type 'Recurse<Int>' has no dynamic member 'foo' using key path from root type 'Recurse<Int>'}}
764764
}
765765

766-
// rdar://problem/60225883 - crash during solution application (ExprRewritter::buildKeyPathDynamicMemberIndexExpr)
766+
// rdar://problem/60225883 - crash during solution application (ExprRewriter::buildKeyPathDynamicMemberIndexExpr)
767767
func test_combination_of_keypath_and_string_lookups() {
768768
@dynamicMemberLookup
769769
struct Outer {

‎test/attr/attr_objc.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@ enum subject_enum: Int {
273273
// Fake for access notes: @objc(subject_enumElement3) // bad-access-note-move@+2{{subject_enum.subject_enumElement4}}
274274
@objc(subject_enumElement3) // bad-access-note-move{{subject_enum.subject_enumElement3}} expected-error {{'@objc' enum case declaration defines multiple enum cases with the same Objective-C name}}{{3-31=}}
275275
case subject_enumElement3, subject_enumElement4
276-
// Becuase of the fake access-note-move above, we expect to see extra diagnostics when we run this test with both explicit @objc attributes *and* access notes:
276+
// Because of the fake access-note-move above, we expect to see extra diagnostics when we run this test with both explicit @objc attributes *and* access notes:
277277
// expected-remark@-2 * {{'@objc' enum case declaration defines multiple enum cases with the same Objective-C name}} expected-note@-2 *{{attribute 'objc' was added by access note for fancy tests}}
278278

279279
// Fake for access notes: @objc // bad-access-note-move@+2{{subject_enum.subject_enumElement6}}
280280
@objc // bad-access-note-move{{subject_enum.subject_enumElement5}} expected-error {{attribute has no effect; cases within an '@objc' enum are already exposed to Objective-C}} {{3-9=}}
281281
case subject_enumElement5, subject_enumElement6
282-
// Becuase of the fake access-note-move above, we expect to see extra diagnostics when we run this test with both explicit @objc attributes *and* access notes:
282+
// Because of the fake access-note-move above, we expect to see extra diagnostics when we run this test with both explicit @objc attributes *and* access notes:
283283
// expected-remark@-2 * {{attribute has no effect; cases within an '@objc' enum are already exposed to Objective-C}} expected-note@-2 *{{attribute 'objc' was added by access note for fancy tests}}
284284

285285
@nonobjc // expected-error {{'@nonobjc' attribute cannot be applied to this declaration}}
@@ -948,14 +948,14 @@ class infer_instanceVar1 {
948948
// expected-note@-2 {{protocol-constrained type containing protocol 'PlainProtocol' cannot be represented in Objective-C}}
949949
// Fake for access notes: @objc // access-note-move@-3{{infer_instanceVar1.instanceVar2_}}
950950

951-
var intstanceVar4: Int {
952-
// CHECK: @objc var intstanceVar4: Int {
951+
var instanceVar4: Int {
952+
// CHECK: @objc var instanceVar4: Int {
953953
get {}
954954
// CHECK-NEXT: @objc get {}
955955
}
956956

957-
var intstanceVar5: Int {
958-
// CHECK: @objc var intstanceVar5: Int {
957+
var instanceVar5: Int {
958+
// CHECK: @objc var instanceVar5: Int {
959959
get {}
960960
// CHECK-NEXT: @objc get {}
961961
set {}
@@ -1738,9 +1738,9 @@ protocol infer_instanceVar4 {
17381738
class infer_instanceVar5 {
17391739
// CHECK-LABEL: {{^}}class infer_instanceVar5 {
17401740

1741-
@objc // access-note-move{{infer_instanceVar5.intstanceVar1}}
1742-
var intstanceVar1: Int {
1743-
// CHECK: @objc var intstanceVar1: Int
1741+
@objc // access-note-move{{infer_instanceVar5.instanceVar1}}
1742+
var instanceVar1: Int {
1743+
// CHECK: @objc var instanceVar1: Int
17441744
get {}
17451745
// CHECK: @objc get {}
17461746
set {}

‎test/attr/private_import.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
@_private(sourceFile: "Array.swift") import Swift // expected-error {{module 'Swift' was not compiled for private import}}
66
@_private(sourceFile: "empty.swift") import empty // no-error
7-
@_private(sourceFile: "not_existing_file.swift") import empty // no-error
7+
@_private(sourceFile: "nonexistent_file.swift") import empty // no-error
88

99
@_private(sourceFile: "none") func foo() {} // expected-error {{@_private may only be used on 'import' declarations}} {{1-31=}}

0 commit comments

Comments
 (0)