summaryrefslogtreecommitdiff
path: root/formats/cbor
diff options
context:
space:
mode:
authorVsevolod Tolstopyatov <qwwdfsad@gmail.com>2020-02-04 18:16:30 +0300
committerVsevolod Tolstopyatov <qwwdfsad@gmail.com>2020-02-06 11:57:46 +0300
commitde2b9587e6d08865d0c7ca2cb44dfc110e93c8f2 (patch)
tree8f76b3e69daca10ce37bcca51feb636c1ab6892f /formats/cbor
parent2649224ac5e06ec1b1247db88374f1c52b62d973 (diff)
downloadkotlinx.serialization-de2b9587e6d08865d0c7ca2cb44dfc110e93c8f2.tar.gz
Migration paths, documentation improvements and additional SerialDescriptorBuilder validation
Diffstat (limited to 'formats/cbor')
-rw-r--r--formats/cbor/commonMain/src/kotlinx/serialization/cbor/Cbor.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/formats/cbor/commonMain/src/kotlinx/serialization/cbor/Cbor.kt b/formats/cbor/commonMain/src/kotlinx/serialization/cbor/Cbor.kt
index 654acd10..48e0f580 100644
--- a/formats/cbor/commonMain/src/kotlinx/serialization/cbor/Cbor.kt
+++ b/formats/cbor/commonMain/src/kotlinx/serialization/cbor/Cbor.kt
@@ -21,7 +21,7 @@ class Cbor(val updateMode: UpdateMode = UpdateMode.BANNED, val encodeDefaults: B
private open inner class CborListWriter(encoder: CborEncoder) : CborWriter(encoder) {
override fun writeBeginToken() = encoder.startArray()
- override fun encodeElement(desc: SerialDescriptor, index: Int): Boolean = true
+ override fun encodeElement(descriptor: SerialDescriptor, index: Int): Boolean = true
}
// Writes class as map [fieldName, fieldValue]
@@ -46,8 +46,8 @@ class Cbor(val updateMode: UpdateMode = UpdateMode.BANNED, val encodeDefaults: B
override fun endStructure(descriptor: SerialDescriptor) = encoder.end()
- override fun encodeElement(desc: SerialDescriptor, index: Int): Boolean {
- val name = desc.getElementName(index)
+ override fun encodeElement(descriptor: SerialDescriptor, index: Int): Boolean {
+ val name = descriptor.getElementName(index)
encoder.encodeString(name)
return true
}
@@ -176,8 +176,8 @@ class Cbor(val updateMode: UpdateMode = UpdateMode.BANNED, val encodeDefaults: B
protected open fun skipBeginToken() = setSize(decoder.startMap())
- override fun beginStructure(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder {
- val re = when (desc.kind) {
+ override fun beginStructure(descriptor: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder {
+ val re = when (descriptor.kind) {
StructureKind.LIST, is PolymorphicKind -> CborListReader(decoder)
StructureKind.MAP -> CborMapReader(decoder)
else -> CborReader(decoder)