Rename _convert -> convert

jsbean · jsbean · commit 38c01f380960 · 2019-07-30T11:16:50.000-04:00
diff --git a/Sources/XMLCoder/Encoder/XMLChoiceEncodingContainer.swift b/Sources/XMLCoder/Encoder/XMLChoiceEncodingContainer.swift
@@ -34,7 +34,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
 
     // MARK: - Coding Path Operations
 
-    private func _converted(_ key: CodingKey) -> CodingKey {
+    private func converted(_ key: CodingKey) -> CodingKey {
         switch encoder.options.keyEncodingStrategy {
         case .useDefaultKeys:
             return key
@@ -67,7 +67,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
 
     public mutating func encodeNil(forKey key: Key) throws {
         container.withShared {
-            $0.key = _converted(key).stringValue
+            $0.key = converted(key).stringValue
             $0.element = NullBox()
         }
     }
@@ -102,7 +102,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
         let elementEncoder: (T, Key, Box) throws -> () = { _, key, box in
             mySelf.container.withShared { container in
                 container.element = box
-                container.key = mySelf._converted(key).stringValue
+                container.key = mySelf.converted(key).stringValue
             }
         }
 
@@ -132,7 +132,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
 
         self.container.withShared { container in
             container.element = sharedKeyed
-            container.key = _converted(key).stringValue
+            container.key = converted(key).stringValue
         }
 
         codingPath.append(key)
@@ -154,7 +154,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
 
         self.container.withShared { container in
             container.element = sharedChoice
-            container.key = _converted(key).stringValue
+            container.key = converted(key).stringValue
         }
 
         codingPath.append(key)
@@ -175,7 +175,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
 
         container.withShared { container in
             container.element = sharedUnkeyed
-            container.key = _converted(key).stringValue
+            container.key = converted(key).stringValue
         }
 
         codingPath.append(key)
@@ -191,7 +191,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
         return XMLReferencingEncoder(
             referencing: encoder,
             key: XMLKey.super,
-            convertedKey: _converted(XMLKey.super),
+            convertedKey: converted(XMLKey.super),
             wrapping: container
         )
     }
@@ -200,7 +200,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol
         return XMLReferencingEncoder(
             referencing: encoder,
             key: key,
-            convertedKey: _converted(key),
+            convertedKey: converted(key),
             wrapping: container
         )
     }
diff --git a/Sources/XMLCoder/Encoder/XMLKeyedEncodingContainer.swift b/Sources/XMLCoder/Encoder/XMLKeyedEncodingContainer.swift
@@ -36,7 +36,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
 
     // MARK: - Coding Path Operations
 
-    private func _converted(_ key: CodingKey) -> CodingKey {
+    private func converted(_ key: CodingKey) -> CodingKey {
         switch encoder.options.keyEncodingStrategy {
         case .useDefaultKeys:
             return key
@@ -69,7 +69,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
 
     public mutating func encodeNil(forKey key: Key) throws {
         container.withShared {
-            $0.elements.append(NullBox(), at: _converted(key).stringValue)
+            $0.elements.append(NullBox(), at: converted(key).stringValue)
         }
     }
 
@@ -113,13 +113,13 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
                 ))
             }
             mySelf.container.withShared { container in
-                container.attributes.append(attribute, at: mySelf._converted(key).stringValue)
+                container.attributes.append(attribute, at: mySelf.converted(key).stringValue)
             }
         }
 
         let elementEncoder: (T, Key, Box) throws -> () = { _, key, box in
             mySelf.container.withShared { container in
-                container.elements.append(box, at: mySelf._converted(key).stringValue)
+                container.elements.append(box, at: mySelf.converted(key).stringValue)
             }
         }
 
@@ -156,7 +156,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
         let sharedKeyed = SharedBox(KeyedBox())
 
         self.container.withShared { container in
-            container.elements.append(sharedKeyed, at: _converted(key).stringValue)
+            container.elements.append(sharedKeyed, at: converted(key).stringValue)
         }
 
         codingPath.append(key)
@@ -177,7 +177,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
         let sharedChoice = SharedBox(ChoiceBox())
 
         self.container.withShared { container in
-            container.elements.append(sharedChoice, at: _converted(key).stringValue)
+            container.elements.append(sharedChoice, at: converted(key).stringValue)
         }
 
         codingPath.append(key)
@@ -197,7 +197,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
         let sharedUnkeyed = SharedBox(UnkeyedBox())
 
         container.withShared { container in
-            container.elements.append(sharedUnkeyed, at: _converted(key).stringValue)
+            container.elements.append(sharedUnkeyed, at: converted(key).stringValue)
         }
 
         codingPath.append(key)
@@ -213,7 +213,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
         return XMLReferencingEncoder(
             referencing: encoder,
             key: XMLKey.super,
-            convertedKey: _converted(XMLKey.super),
+            convertedKey: converted(XMLKey.super),
             wrapping: container
         )
     }
@@ -222,7 +222,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {
         return XMLReferencingEncoder(
             referencing: encoder,
             key: key,
-            convertedKey: _converted(key),
+            convertedKey: converted(key),
             wrapping: container
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`34`	`34`
`35`	`35`	`// MARK: - Coding Path Operations`
`36`	`36`
`37`		`- private func _converted(_ key: CodingKey) -> CodingKey {`
	`37`	`+ private func converted(_ key: CodingKey) -> CodingKey {`
`38`	`38`	`switch encoder.options.keyEncodingStrategy {`
`39`	`39`	`case .useDefaultKeys:`
`40`	`40`	`return key`
`@@ -67,7 +67,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`67`	`67`
`68`	`68`	`public mutating func encodeNil(forKey key: Key) throws {`
`69`	`69`	`container.withShared {`
`70`		`- $0.key = _converted(key).stringValue`
	`70`	`+ $0.key = converted(key).stringValue`
`71`	`71`	`$0.element = NullBox()`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -102,7 +102,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`102`	`102`	`let elementEncoder: (T, Key, Box) throws -> () = { _, key, box in`
`103`	`103`	`mySelf.container.withShared { container in`
`104`	`104`	`container.element = box`
`105`		`- container.key = mySelf._converted(key).stringValue`
	`105`	`+ container.key = mySelf.converted(key).stringValue`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`@@ -132,7 +132,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`132`	`132`
`133`	`133`	`self.container.withShared { container in`
`134`	`134`	`container.element = sharedKeyed`
`135`		`- container.key = _converted(key).stringValue`
	`135`	`+ container.key = converted(key).stringValue`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`codingPath.append(key)`
`@@ -154,7 +154,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`154`	`154`
`155`	`155`	`self.container.withShared { container in`
`156`	`156`	`container.element = sharedChoice`
`157`		`- container.key = _converted(key).stringValue`
	`157`	`+ container.key = converted(key).stringValue`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`codingPath.append(key)`
`@@ -175,7 +175,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`175`	`175`
`176`	`176`	`container.withShared { container in`
`177`	`177`	`container.element = sharedUnkeyed`
`178`		`- container.key = _converted(key).stringValue`
	`178`	`+ container.key = converted(key).stringValue`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`codingPath.append(key)`
`@@ -191,7 +191,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`191`	`191`	`return XMLReferencingEncoder(`
`192`	`192`	`referencing: encoder,`
`193`	`193`	`key: XMLKey.super,`
`194`		`- convertedKey: _converted(XMLKey.super),`
	`194`	`+ convertedKey: converted(XMLKey.super),`
`195`	`195`	`wrapping: container`
`196`	`196`	`)`
`197`	`197`	`}`
`@@ -200,7 +200,7 @@ struct XMLChoiceEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol`
`200`	`200`	`return XMLReferencingEncoder(`
`201`	`201`	`referencing: encoder,`
`202`	`202`	`key: key,`
`203`		`- convertedKey: _converted(key),`
	`203`	`+ convertedKey: converted(key),`
`204`	`204`	`wrapping: container`
`205`	`205`	`)`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`36`	`36`
`37`	`37`	`// MARK: - Coding Path Operations`
`38`	`38`
`39`		`- private func _converted(_ key: CodingKey) -> CodingKey {`
	`39`	`+ private func converted(_ key: CodingKey) -> CodingKey {`
`40`	`40`	`switch encoder.options.keyEncodingStrategy {`
`41`	`41`	`case .useDefaultKeys:`
`42`	`42`	`return key`
`@@ -69,7 +69,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`69`	`69`
`70`	`70`	`public mutating func encodeNil(forKey key: Key) throws {`
`71`	`71`	`container.withShared {`
`72`		`- $0.elements.append(NullBox(), at: _converted(key).stringValue)`
	`72`	`+ $0.elements.append(NullBox(), at: converted(key).stringValue)`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`@@ -113,13 +113,13 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`113`	`113`	`))`
`114`	`114`	`}`
`115`	`115`	`mySelf.container.withShared { container in`
`116`		`- container.attributes.append(attribute, at: mySelf._converted(key).stringValue)`
	`116`	`+ container.attributes.append(attribute, at: mySelf.converted(key).stringValue)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`let elementEncoder: (T, Key, Box) throws -> () = { _, key, box in`
`121`	`121`	`mySelf.container.withShared { container in`
`122`		`- container.elements.append(box, at: mySelf._converted(key).stringValue)`
	`122`	`+ container.elements.append(box, at: mySelf.converted(key).stringValue)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`@@ -156,7 +156,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`156`	`156`	`let sharedKeyed = SharedBox(KeyedBox())`
`157`	`157`
`158`	`158`	`self.container.withShared { container in`
`159`		`- container.elements.append(sharedKeyed, at: _converted(key).stringValue)`
	`159`	`+ container.elements.append(sharedKeyed, at: converted(key).stringValue)`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`codingPath.append(key)`
`@@ -177,7 +177,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`177`	`177`	`let sharedChoice = SharedBox(ChoiceBox())`
`178`	`178`
`179`	`179`	`self.container.withShared { container in`
`180`		`- container.elements.append(sharedChoice, at: _converted(key).stringValue)`
	`180`	`+ container.elements.append(sharedChoice, at: converted(key).stringValue)`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`codingPath.append(key)`
`@@ -197,7 +197,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`197`	`197`	`let sharedUnkeyed = SharedBox(UnkeyedBox())`
`198`	`198`
`199`	`199`	`container.withShared { container in`
`200`		`- container.elements.append(sharedUnkeyed, at: _converted(key).stringValue)`
	`200`	`+ container.elements.append(sharedUnkeyed, at: converted(key).stringValue)`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`codingPath.append(key)`
`@@ -213,7 +213,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`213`	`213`	`return XMLReferencingEncoder(`
`214`	`214`	`referencing: encoder,`
`215`	`215`	`key: XMLKey.super,`
`216`		`- convertedKey: _converted(XMLKey.super),`
	`216`	`+ convertedKey: converted(XMLKey.super),`
`217`	`217`	`wrapping: container`
`218`	`218`	`)`
`219`	`219`	`}`
`@@ -222,7 +222,7 @@ struct XMLKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProtocol {`
`222`	`222`	`return XMLReferencingEncoder(`
`223`	`223`	`referencing: encoder,`
`224`	`224`	`key: key,`
`225`		`- convertedKey: _converted(key),`
	`225`	`+ convertedKey: converted(key),`
`226`	`226`	`wrapping: container`
`227`	`227`	`)`
`228`	`228`	`}`