Skip to content

Commit e75e5b5

Browse files
authored
Spelling interop (#42549)
* spelling: different Signed-off-by: Josh Soref <[email protected]> * spelling: disappear Signed-off-by: Josh Soref <[email protected]> * spelling: executable Signed-off-by: Josh Soref <[email protected]> * spelling: instantiate Signed-off-by: Josh Soref <[email protected]> * spelling: instantiation Signed-off-by: Josh Soref <[email protected]> * spelling: member Signed-off-by: Josh Soref <[email protected]> * spelling: parameter Signed-off-by: Josh Soref <[email protected]> * spelling: section Signed-off-by: Josh Soref <[email protected]> * spelling: trivia Signed-off-by: Josh Soref <[email protected]> * spelling: unrelated Signed-off-by: Josh Soref <[email protected]> Co-authored-by: Josh Soref <[email protected]>
1 parent d619b3f commit e75e5b5

14 files changed

+19
-19
lines changed

test/Interop/Cxx/class/memberwise-initializer-typechecker.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import MemberwiseInitializer
44

55
let structPrivateOnly = StructPrivateOnly(varPrivate: 42) // expected-error {{argument passed to call that takes no arguments}}
66
let structPublicOnly = StructPublicOnly(varPublic: 42)
7-
let structEmptyPrivateSetion = StructEmptyPrivateSection(varPublic: 42)
7+
let structEmptyPrivateSection = StructEmptyPrivateSection(varPublic: 42)
88
let structPublicAndPrivate1 = StructPublicAndPrivate(varPublic: 42) // expected-error {{argument passed to call that takes no arguments}}
99
let structPublicAndPrivate2 = StructPublicAndPrivate(varPublic: 42, varPrivate: 23) // expected-error {{argument passed to call that takes no arguments}}
1010
let structWithUnimportedMemberFunction = StructWithUnimportedMemberFunction(varPublic: 42)
1111

1212
let classPrivateOnly = ClassPrivateOnly(varPrivate: 42) // expected-error {{argument passed to call that takes no arguments}}
1313
let classPublicOnly = ClassPublicOnly(varPublic: 42)
14-
let classEmptyPublicSetion = ClassEmptyPublicSection(varPrivate: 42) // expected-error {{argument passed to call that takes no arguments}}
14+
let classEmptyPublicSection = ClassEmptyPublicSection(varPrivate: 42) // expected-error {{argument passed to call that takes no arguments}}
1515
let classPublicAndPrivate1 = ClassPrivateAndPublic(varPublic: 23) // expected-error {{argument passed to call that takes no arguments}}
1616
let classPublicAndPrivate2 = ClassPrivateAndPublic(varPrivate: 42, varPublic: 23) // expected-error {{argument passed to call that takes no arguments}}
1717
let classWithUnimportedMemberFunction = ClassWithUnimportedMemberFunction(varPublic: 42)

test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir | %FileCheck %s
22

3-
// Verify that non-trival/address-only C++ classes are constructed and accessed
3+
// Verify that non-trivial/address-only C++ classes are constructed and accessed
44
// correctly. Make sure that we correctly IRGen functions that construct
55
// non-trivial C++ classes, take those classes as a parameter, and access those
66
// classes members.

test/Interop/Cxx/templates/Inputs/defaulted-template-type-parameter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ template <class T>
3636
void functionTemplateWithDefaultedParam(T = 0) {}
3737

3838
template <class T = void>
39-
void defaultedTemplateTypeParamUsedInSignatureAndUnrealtedParam(int, T) {}
39+
void defaultedTemplateTypeParamUsedInSignatureAndUnrelatedParam(int, T) {}
4040

4141
template <class = void>
42-
void defaultedTemplateTypeParamAndUnrealtedParam(int) {}
42+
void defaultedTemplateTypeParamAndUnrelatedParam(int) {}
4343

4444
template <class T = int>
4545
void overloadedDefaultedTemplate(T) {}

test/Interop/Cxx/templates/Inputs/function-templates.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ template <class R, class T, class U> R templateParameterReturnType(T a, U b) {
2424
// Same here:
2525
template <class T> void cannotInferTemplate() {}
2626

27-
struct HasVariadicMemeber {
27+
struct HasVariadicMember {
2828
void test1(...) {}
2929
void test2(int, ...) {}
3030
};

test/Interop/Cxx/templates/Inputs/module.modulemap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module ExplicitClassSpecialization {
3333
requires cplusplus
3434
}
3535

36-
module ClassTemplateInstantionExistingSpecialization {
36+
module ClassTemplateInstantiationExistingSpecialization {
3737
header "class-template-instantiation-existing-specialization.h"
3838
requires cplusplus
3939
}

test/Interop/Cxx/templates/class-template-instantiation-existing-specialization.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// REQUIRES: executable_test
44

55
// Please don't add tests into this test case - its setup is quite delicate.
6-
import ClassTemplateInstantionExistingSpecialization
6+
import ClassTemplateInstantiationExistingSpecialization
77
import StdlibUnittest
88

99
var TemplatesTestSuite = TestSuite("TemplatesTestSuite")

test/Interop/Cxx/templates/defaulted-template-type-parameter-module-interface.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
// CHECK: func defaultedTemplateTypeParamUsedInReturn<T>() -> T
1111
// CHECK: func defaultedTemplateTypeParamAndDefaultedParam<T>(_: T)
1212
// CHECK: func functionTemplateWithDefaultedParam<T>(_: T)
13-
// CHECK: func defaultedTemplateTypeParamUsedInSignatureAndUnrealtedParam<T>(_: Int32, _: T)
14-
// CHECK: func defaultedTemplateTypeParamAndUnrealtedParam(_: Int32)
13+
// CHECK: func defaultedTemplateTypeParamUsedInSignatureAndUnrelatedParam<T>(_: Int32, _: T)
14+
// CHECK: func defaultedTemplateTypeParamAndUnrelatedParam(_: Int32)
1515
// CHECK: func overloadedDefaultedTemplate<T>(_: T)
1616
// CHECK: func overloadedDefaultedTemplate(_: Int32)
1717
// CHECK: func defaultedTemplateReferenceTypeParam<T>(_ t: inout T)
1818
// The following types aren't imported correctly, but that does not have to do
19-
// with the fact that the template type paramaters are defaulted.
19+
// with the fact that the template type parameters are defaulted.
2020
// TODO: reenable the following checks: (rdar://90587703)
2121
// TODO-CHECK: func defaultedTemplatePointerTypeParam<T>(_ t: UnsafeMutablePointer<T>)
2222
// TODO-CHECK: func defaultedTemplatePointerPointerTypeParam<T>(_ t: UnsafeMutablePointer<OpaquePointer?>!)

test/Interop/Cxx/templates/defaulted-template-type-parameter.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ DefaultedTemplateTestSuite.test("Function with defaulted template type parameter
2424
let _: Int = defaultedTemplateTypeParamUsedInReturn()
2525
defaultedTemplateTypeParamAndDefaultedParam(0)
2626
functionTemplateWithDefaultedParam(0)
27-
defaultedTemplateTypeParamUsedInSignatureAndUnrealtedParam(0, 0)
28-
defaultedTemplateTypeParamAndUnrealtedParam(0)
27+
defaultedTemplateTypeParamUsedInSignatureAndUnrelatedParam(0, 0)
28+
defaultedTemplateTypeParamAndUnrelatedParam(0)
2929
}
3030

3131
DefaultedTemplateTestSuite.test("Overloaded function template is not ambiguous") {

test/Interop/Cxx/templates/dependent-types.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DependentTypesTestSuite.test("Different dependent inferred by arg.") {
2323
expectEqual(m.getValue(), 42)
2424
}
2525

26-
DependentTypesTestSuite.test("Instanciate the same function twice") {
26+
DependentTypesTestSuite.test("Instantiate the same function twice") {
2727
// Intentionally test the same thing twice.
2828
let m = dependantReturnTypeInffered(42) as! M<Int>
2929
expectEqual(m.getValue(), 42)

test/Interop/Cxx/templates/function-template-module-interface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// CHECK: func templateParameterReturnType<R, T, U>(_ a: T, _ b: U) -> R
88
// CHECK: func cannotInferTemplate<T>(T: T.Type)
99

10-
// CHECK: struct HasVariadicMemeber {
10+
// CHECK: struct HasVariadicMember {
1111
// CHECK: @available(*, unavailable, message: "Variadic function is unavailable")
1212
// CHECK: mutating func test1(_ varargs: Any...)
1313
// CHECK: @available(*, unavailable, message: "Variadic function is unavailable")

test/Interop/Cxx/templates/swift-class-instantiation-in-namespace-module-interface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %target-swiftxx-frontend -emit-module -o %t/SwiftClassTemplateInNamespaceModule.swiftmodule %S/Inputs/SwiftClassTemplateInNamespaceModule.swift -I %S/Inputs -enable-library-evolution -swift-version 5
33
// RUN: %target-swift-ide-test -print-module -module-to-print=SwiftClassTemplateInNamespaceModule -I %t/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
44

5-
// The following bug needs to be resolved so decls in __ObjC don't dissapear.
5+
// The following bug needs to be resolved so decls in __ObjC don't disappear.
66
// REQUIRES: SR-14211
77

88
// CHECK: import ClassTemplateInNamespaceForSwiftModule

test/Interop/Cxx/templates/template-type-parameter-not-in-signature.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TemplateNotInSignatureTestSuite.test("Function with defaulted template type para
1717
expectEqual(y, 10)
1818
}
1919

20-
TemplateNotInSignatureTestSuite.test("Instanciate the same function template twice.") {
20+
TemplateNotInSignatureTestSuite.test("Instantiate the same function template twice.") {
2121
// Intentionally test the same thing twice.
2222
templateTypeParamNotUsedInSignature(T: Int.self)
2323
templateTypeParamNotUsedInSignature(T: Int.self)

test/Interop/Cxx/value-witness-table/Inputs/custom-destructors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct HasDefaultedDestructor {
2626
};
2727

2828
// For the following objects with virtual bases / destructors, make sure that
29-
// any exectuable user of these objects disable rtti and exceptions. Otherwise,
29+
// any executable user of these objects disable rtti and exceptions. Otherwise,
3030
// the linker will error because of undefined vtables.
3131
// FIXME: Once we can link with libc++ we can enable RTTI.
3232

test/Interop/Cxx/value-witness-table/witness-layout-opts-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// This test checks that the compiler uses well-known witness tables for types
44
// that have the appropriate size/shape (for example, { i8 x 4 } -> i32).
55

6-
// These witness tables look very differnt on Windows so it doesn't make sense
6+
// These witness tables look very different on Windows so it doesn't make sense
77
// to test them in the same file.
88
// XFAIL: OS=windows-msvc
99

0 commit comments

Comments
 (0)