Skip to content

Commit b3e76c9

Browse files
committed
Check for Map.Entry in KT-30016 workaround
1 parent cd3c09d commit b3e76c9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/commonMain/src/implementations/immutableMap/PersistentHashMapBuilderContentViews.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class PersistentHashMapBuilderEntries<K, V>(private val builder: Persis
2121

2222
override fun remove(element: MutableMap.MutableEntry<K, V>): Boolean {
2323
// TODO: Eliminate this check after KT-30016 gets fixed.
24-
if ((element as Any?) !is MutableMap.MutableEntry<*, *>) return false
24+
if ((element as Any?) !is Map.Entry<*, *>) return false
2525
return builder.remove(element.key, element.value)
2626
}
2727

@@ -30,7 +30,7 @@ internal class PersistentHashMapBuilderEntries<K, V>(private val builder: Persis
3030

3131
override fun contains(element: MutableMap.MutableEntry<K, V>): Boolean {
3232
// TODO: Eliminate this check after KT-30016 gets fixed.
33-
if ((element as Any?) !is MutableMap.MutableEntry<*, *>) return false
33+
if ((element as Any?) !is Map.Entry<*, *>) return false
3434
return builder[element.key]?.let { candidate -> candidate == element.value }
3535
?: (element.value == null && builder.containsKey(element.key))
3636
}

core/commonMain/src/implementations/persistentOrderedMap/PersistentOrderedMapBuilderContentViews.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class PersistentOrderedMapBuilderEntries<K, V>(private val builder: Per
2121

2222
override fun remove(element: MutableMap.MutableEntry<K, V>): Boolean {
2323
// TODO: Eliminate this check after KT-30016 gets fixed.
24-
if ((element as Any?) !is MutableMap.MutableEntry<*, *>) return false
24+
if ((element as Any?) !is Map.Entry<*, *>) return false
2525
return builder.remove(element.key, element.value)
2626
}
2727

@@ -30,7 +30,7 @@ internal class PersistentOrderedMapBuilderEntries<K, V>(private val builder: Per
3030

3131
override fun contains(element: MutableMap.MutableEntry<K, V>): Boolean {
3232
// TODO: Eliminate this check after KT-30016 gets fixed.
33-
if ((element as Any?) !is MutableMap.MutableEntry<*, *>) return false
33+
if ((element as Any?) !is Map.Entry<*, *>) return false
3434
return builder[element.key]?.let { candidate -> candidate == element.value }
3535
?: (element.value == null && builder.containsKey(element.key))
3636
}

0 commit comments

Comments
 (0)