Skip to content

Commit 7cf8bf4

Browse files
committed
migrator: correct a typo in the inserted helper function. NFC
1 parent 65eaccb commit 7cf8bf4

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

lib/Migrator/APIDiffMigratorPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
708708
OS << "// Helper function inserted by Swift 4.2 migrator.\n";
709709
OS << "fileprivate func ";
710710
unsigned FuncNameStart = Buffer.size();
711-
OS << "converTo";
711+
OS << "convertTo";
712712
SmallVector<std::string, 8> Segs;
713713
switch(Anno) {
714714
case NodeAnnotation::OptionalArrayMemberUpdate:

test/Migrator/string-representable.swift.expected

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ import Cities
88

99
func foo(_ c: Container) -> String {
1010
c.Value = NewAttribute(rawValue: "")
11-
c.addingAttributes(converToCitiesContainerAttributeDictionary(["a": "b", "a": "b", "a": "b"]))
12-
c.addingAttributes(converToCitiesContainerAttributeDictionary(["a": "b", "a": "b", "a": "b"]))
13-
c.adding(attributes: converToSimpleAttributeDictionary(["a": 1, "a": 2, "a": 3]))
14-
c.adding(optionalAttributes: converToOptionalSimpleAttributeDictionary(["a": 1, "a": 2, "a": 3]))
15-
_ = Container(optionalAttributes: converToOptionalSimpleAttributeDictionary(nil))
16-
_ = Container(optionalAttrArray: converToOptionalSimpleAttributeArray(nil))
17-
c.adding(attrArray: converToSimpleAttributeArray(["key1", "key2"]))
11+
c.addingAttributes(convertToCitiesContainerAttributeDictionary(["a": "b", "a": "b", "a": "b"]))
12+
c.addingAttributes(convertToCitiesContainerAttributeDictionary(["a": "b", "a": "b", "a": "b"]))
13+
c.adding(attributes: convertToSimpleAttributeDictionary(["a": 1, "a": 2, "a": 3]))
14+
c.adding(optionalAttributes: convertToOptionalSimpleAttributeDictionary(["a": 1, "a": 2, "a": 3]))
15+
_ = Container(optionalAttributes: convertToOptionalSimpleAttributeDictionary(nil))
16+
_ = Container(optionalAttrArray: convertToOptionalSimpleAttributeArray(nil))
17+
c.adding(attrArray: convertToSimpleAttributeArray(["key1", "key2"]))
1818
return c.Value.rawValue
1919
}
2020

2121
// Helper function inserted by Swift 4.2 migrator.
22-
fileprivate func converToCitiesContainerAttributeDictionary(_ input: [String: Any]) -> [Cities.Container.Attribute: Any] {
22+
fileprivate func convertToCitiesContainerAttributeDictionary(_ input: [String: Any]) -> [Cities.Container.Attribute: Any] {
2323
return Dictionary(uniqueKeysWithValues: input.map { key, value in (Cities.Container.Attribute(rawValue: key), value)})
2424
}
2525

2626
// Helper function inserted by Swift 4.2 migrator.
27-
fileprivate func converToSimpleAttributeDictionary(_ input: [String: Any]) -> [SimpleAttribute: Any] {
27+
fileprivate func convertToSimpleAttributeDictionary(_ input: [String: Any]) -> [SimpleAttribute: Any] {
2828
return Dictionary(uniqueKeysWithValues: input.map { key, value in (SimpleAttribute(rawValue: key), value)})
2929
}
3030

3131
// Helper function inserted by Swift 4.2 migrator.
32-
fileprivate func converToOptionalSimpleAttributeDictionary(_ input: [String: Any]?) -> [SimpleAttribute: Any]? {
32+
fileprivate func convertToOptionalSimpleAttributeDictionary(_ input: [String: Any]?) -> [SimpleAttribute: Any]? {
3333
guard let input = input else { return nil }
3434
return Dictionary(uniqueKeysWithValues: input.map { key, value in (SimpleAttribute(rawValue: key), value)})
3535
}
3636

3737
// Helper function inserted by Swift 4.2 migrator.
38-
fileprivate func converToOptionalSimpleAttributeArray(_ input: [String]?) -> [SimpleAttribute]? {
38+
fileprivate func convertToOptionalSimpleAttributeArray(_ input: [String]?) -> [SimpleAttribute]? {
3939
guard let input = input else { return nil }
4040
return input.map { key in SimpleAttribute(key) }
4141
}
4242

4343
// Helper function inserted by Swift 4.2 migrator.
44-
fileprivate func converToSimpleAttributeArray(_ input: [String]) -> [SimpleAttribute] {
44+
fileprivate func convertToSimpleAttributeArray(_ input: [String]) -> [SimpleAttribute] {
4545
return input.map { key in SimpleAttribute(key) }
4646
}

0 commit comments

Comments
 (0)