Skip to content

Commit a5227cf

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev
2 parents cf6e41a + d3288f2 commit a5227cf

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

core/commonMain/src/kotlinx/serialization/SerialFormat.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public interface BinaryFormat : SerialFormat {
5555
public fun <T> encodeToByteArray(serializer: SerializationStrategy<T>, value: T): ByteArray
5656

5757
/**
58-
* Decodes and deserializes the given [byte array][bytes] to to the value of type [T] using the given [deserializer]
58+
* Decodes and deserializes the given [byte array][bytes] to the value of type [T] using the given [deserializer]
5959
*/
6060
public fun <T> decodeFromByteArray(deserializer: DeserializationStrategy<T>, bytes: ByteArray): T
6161
}
@@ -79,7 +79,7 @@ public interface StringFormat : SerialFormat {
7979
public fun <T> encodeToString(serializer: SerializationStrategy<T>, value: T): String
8080

8181
/**
82-
* Decodes and deserializes the given [string] to to the value of type [T] using the given [deserializer]
82+
* Decodes and deserializes the given [string] to the value of type [T] using the given [deserializer]
8383
*/
8484
public fun <T> decodeFromString(deserializer: DeserializationStrategy<T>, string: String): T
8585
}
@@ -92,7 +92,7 @@ public inline fun <reified T> StringFormat.encodeToString(value: T): String =
9292
encodeToString(serializersModule.serializer(), value)
9393

9494
/**
95-
* Decodes and deserializes the given [string] to to the value of type [T] using deserializer
95+
* Decodes and deserializes the given [string] to the value of type [T] using deserializer
9696
* retrieved from the reified type parameter.
9797
*/
9898
@OptIn(ExperimentalSerializationApi::class)
@@ -153,7 +153,7 @@ public inline fun <reified T> BinaryFormat.encodeToByteArray(value: T): ByteArra
153153
encodeToByteArray(serializersModule.serializer(), value)
154154

155155
/**
156-
* Decodes and deserializes the given [byte array][bytes] to to the value of type [T] using deserializer
156+
* Decodes and deserializes the given [byte array][bytes] to the value of type [T] using deserializer
157157
* retrieved from the reified type parameter.
158158
*/
159159
@OptIn(ExperimentalSerializationApi::class)

formats/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ For convenience, they have same `groupId`, versioning and release cycle as core
1515

1616
* Artifact id: `kotlinx-serialization-hocon`
1717
* Platform: JVM only
18+
* Status: experimental
1819

1920
Allows deserialization of `Config` object from popular [lightbend/config](https://github.com/lightbend/config) library
2021
into Kotlin objects.
@@ -58,6 +59,14 @@ This library allows serialization and deserialization of objects to and from [Av
5859

5960
Allows serialization and deserialization of objects to and from [BSON](https://docs.mongodb.com/manual/reference/bson-types/).
6061

62+
### Ktoml
63+
* GitHub repo: [akuleshov7/ktoml](https://github.com/akuleshov7/ktoml)
64+
* Artifact ID: `com.akuleshov7:ktoml-core`
65+
* Platforms: multiplatform, all Kotlin supported platforms
66+
67+
Fully Native and Multiplatform Kotlin serialization library for serialization/deserialization of TOML format.
68+
This library contains no Java code and no Java dependencies and it implements multiplatform parser, decoder and encoder of TOML.
69+
6170
### Minecraft NBT (Multiplatform)
6271

6372
* GitHub repo: [BenWoodworth/knbt](https://github.com/BenWoodworth/knbt)

formats/json/jvmMain/src/kotlinx/serialization/json/internal/JsonStringBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package kotlinx.serialization.json.internal
88
* In order to encode a single string, it should be processed symbol-per-symbol,
99
* in order to detect and escape unicode symbols.
1010
*
11-
* Doing naively, it drastically slows down strings processing due to to factors:
11+
* Doing naively, it drastically slows down strings processing due to factors:
1212
* * Byte-by-byte copying that does not leverage optimized array copying
1313
* * A lot of range and flags checks due to Java's compact strings
1414
*

0 commit comments

Comments
 (0)