azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make emptyMap upperbound to be Any? rather than Any.

Browse Source 
#KT-9963
This commit is contained in:
Ilya Gorbunov
2015-11-11 01:28:25 +03:00
parent 6f2fb3f9aa
commit 5b484f1e05
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/Maps.kt
+5 -5
View File
@@ -6,7 +6,7 @@ package kotlin
import java.io.Serializable import java.io.Serializable
import java.util.* import java.util.*
private object EmptyMap : Map<Any, Nothing>, Serializable { private object EmptyMap : Map<Any?, Nothing>, Serializable {
override fun equals(other: Any?): Boolean = other is Map<*,*> && other.isEmpty() override fun equals(other: Any?): Boolean = other is Map<*,*> && other.isEmpty()
override fun hashCode(): Int = 0 override fun hashCode(): Int = 0
override fun toString(): String = "{}" override fun toString(): String = "{}"
@@ -14,11 +14,11 @@ private object EmptyMap : Map<Any, Nothing>, Serializable {
override val size: Int get() = 0 override val size: Int get() = 0
override fun isEmpty(): Boolean = true override fun isEmpty(): Boolean = true
override fun containsKey(key: Any): Boolean = false override fun containsKey(key: Any?): Boolean = false
override fun containsValue(value: Nothing): Boolean = false override fun containsValue(value: Nothing): Boolean = false
override fun get(key: Any): Nothing? = null override fun get(key: Any?): Nothing? = null
override val entries: Set<Map.Entry<Any, Nothing>> get() = EmptySet override val entries: Set<Map.Entry<Any?, Nothing>> get() = EmptySet
override val keys: Set<Any> get() = EmptySet override val keys: Set<Any?> get() = EmptySet
override val values: Collection<Nothing> get() = EmptyList override val values: Collection<Nothing> get() = EmptyList
private fun readResolve(): Any = EmptyMap private fun readResolve(): Any = EmptyMap
libraries/stdlib/test/collections/CollectionBehaviors.kt
+4
View File
@@ -89,6 +89,10 @@ public fun <K, V> CompareContext<Map<K, V>>.mapBehavior() {
if (expected.isEmpty().not()) if (expected.isEmpty().not())
propertyEquals { contains(keySet().first()) } propertyEquals { contains(keySet().first()) }
propertyEquals { containsKeyRaw(keys.firstOrNull()) }
propertyEquals { containsValueRaw(values.firstOrNull()) }
propertyEquals { getRaw(null) }
compareProperty( { keySet() }, { setBehavior("keySet") } ) compareProperty( { keySet() }, { setBehavior("keySet") } )
compareProperty( { entrySet() }, { setBehavior("entrySet") } ) compareProperty( { entrySet() }, { setBehavior("entrySet") } )
compareProperty( { values() }, { collectionBehavior("values") }) compareProperty( { values() }, { collectionBehavior("values") })