Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merging MapLikeSerializers when merging with non-empty maps #1712

Merged
merged 1 commit into from Oct 14, 2021
Merged

Fix merging MapLikeSerializers when merging with non-empty maps #1712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/commonMain/src/kotlinx/serialization/internal/CollectionSerializers.kt
View file
Open in desktop
Expand Up @@ -257,7 +257,7 @@ internal class LinkedHashMapSerializer<K, V>(
override fun Map<K, V>.collectionSize(): Int = size
override fun Map<K, V>.collectionIterator(): Iterator<Map.Entry<K, V>> = iterator()
override fun builder(): LinkedHashMap<K, V> = LinkedHashMap()
override fun LinkedHashMap<K, V>.builderSize(): Int = size
override fun LinkedHashMap<K, V>.builderSize(): Int = size * 2
override fun LinkedHashMap<K, V>.toResult(): Map<K, V> = this
override fun Map<K, V>.toBuilder(): LinkedHashMap<K, V> = this as? LinkedHashMap<K, V> ?: LinkedHashMap(this)
override fun LinkedHashMap<K, V>.checkCapacity(size: Int) {}
Expand All @@ -273,7 +273,7 @@ internal class HashMapSerializer<K, V>(
override fun Map<K, V>.collectionSize(): Int = size
override fun Map<K, V>.collectionIterator(): Iterator<Map.Entry<K, V>> = iterator()
override fun builder(): HashMap<K, V> = HashMap()
override fun HashMap<K, V>.builderSize(): Int = size
override fun HashMap<K, V>.builderSize(): Int = size * 2
override fun HashMap<K, V>.toResult(): Map<K, V> = this
override fun Map<K, V>.toBuilder(): HashMap<K, V> = this as? HashMap<K, V> ?: HashMap(this)
override fun HashMap<K, V>.checkCapacity(size: Int) {}
Expand Down