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

Deprecate Map.minus and minusAssign operators.

Browse Source 
Disable tests failing in JS.
This commit is contained in:
Ilya Gorbunov
2016-01-19 07:09:57 +03:00
parent 7896e58afc
commit 300a4be060
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/Maps.kt
+8
View File
@@ -487,30 +487,35 @@ public operator fun <K, V> MutableMap<K, V>.plusAssign(map: Map<K, V>) {
/** /**
* Creates a new read-only map by removing a [key] from this map. * Creates a new read-only map by removing a [key] from this map.
*/ */
@Deprecated("This operation will be removed soon.")
public operator fun <K, V> Map<K, V>.minus(key: K): Map<K, V> public operator fun <K, V> Map<K, V>.minus(key: K): Map<K, V>
= this.toLinkedMap().apply { minusAssign(key) } = this.toLinkedMap().apply { minusAssign(key) }
/** /**
* Creates a new read-only map by removing a collection of [keys] from this map. * Creates a new read-only map by removing a collection of [keys] from this map.
*/ */
@Deprecated("This operation will be removed soon.")
public operator fun <K, V> Map<K, V>.minus(keys: Iterable<K>): Map<K, V> public operator fun <K, V> Map<K, V>.minus(keys: Iterable<K>): Map<K, V>
= this.toLinkedMap().apply { minusAssign(keys) } = this.toLinkedMap().apply { minusAssign(keys) }
/** /**
* Creates a new read-only map by removing a array of [keys] from this map. * Creates a new read-only map by removing a array of [keys] from this map.
*/ */
@Deprecated("This operation will be removed soon.")
public operator fun <K, V> Map<K, V>.minus(keys: Array<K>): Map<K, V> public operator fun <K, V> Map<K, V>.minus(keys: Array<K>): Map<K, V>
= this.toLinkedMap().apply { minusAssign(keys) } = this.toLinkedMap().apply { minusAssign(keys) }
/** /**
* Creates a new read-only map by removing a sequence of [keys] from this map. * Creates a new read-only map by removing a sequence of [keys] from this map.
*/ */
@Deprecated("This operation will be removed soon.")
public operator fun <K, V> Map<K, V>.minus(keys: Sequence<K>): Map<K, V> public operator fun <K, V> Map<K, V>.minus(keys: Sequence<K>): Map<K, V>
= this.toLinkedMap().apply { minusAssign(keys) } = this.toLinkedMap().apply { minusAssign(keys) }
/** /**
* Removes the given [key] from this mutable map. * Removes the given [key] from this mutable map.
*/ */
@Deprecated("This operation will be removed soon, use remove(key) instead.", ReplaceWith("this.keys -= key"))
public operator fun <K, V> MutableMap<K, V>.minusAssign(key: K) { public operator fun <K, V> MutableMap<K, V>.minusAssign(key: K) {
remove(key) remove(key)
} }
@@ -518,6 +523,7 @@ public operator fun <K, V> MutableMap<K, V>.minusAssign(key: K) {
/** /**
* Removes all the given [keys] from this mutable map. * Removes all the given [keys] from this mutable map.
*/ */
@Deprecated("This operation will be removed soon.", ReplaceWith("this.keys -= keys"))
public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Iterable<K>) { public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Iterable<K>) {
for (key in keys) remove(key) for (key in keys) remove(key)
} }
@@ -525,6 +531,7 @@ public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Iterable<K>) {
/** /**
* Removes all the given [keys] from this mutable map. * Removes all the given [keys] from this mutable map.
*/ */
@Deprecated("This operation will be removed soon.", ReplaceWith("this.keys -= keys"))
public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Array<K>) { public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Array<K>) {
for (key in keys) remove(key) for (key in keys) remove(key)
} }
@@ -532,6 +539,7 @@ public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Array<K>) {
/** /**
* Removes all the given [keys] from this mutable map. * Removes all the given [keys] from this mutable map.
*/ */
@Deprecated("This operation will be removed soon.", ReplaceWith("this.keys -= keys"))
public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Sequence<K>) { public operator fun <K, V> MutableMap<K, V>.minusAssign(keys: Sequence<K>) {
for (key in keys) remove(key) for (key in keys) remove(key)
} }
libraries/stdlib/test/collections/MapTest.kt
+11 -9
View File
@@ -357,16 +357,18 @@ class MapTest {
assertEquals("A" to 1, original.entries.single().toPair()) assertEquals("A" to 1, original.entries.single().toPair())
} }
/*
@test fun minusAssign() = testMinusAssign { @test fun minusAssign() = testMinusAssign {
it -= "B" it.keys -= "B"
it -= "C" it.keys -= "C"
} }
@test fun minusAssignList() = testMinusAssign { it -= listOf("B", "C") } @test fun minusAssignList() = testMinusAssign { it.keys -= listOf("B", "C") }
@test fun minusAssignArray() = testMinusAssign { it -= arrayOf("B", "C") } @test fun minusAssignArray() = testMinusAssign { it.keys -= arrayOf("B", "C") }
@test fun minusAssignSequence() = testMinusAssign { it -= sequenceOf("B", "C") } @test fun minusAssignSequence() = testMinusAssign { it.keys -= sequenceOf("B", "C") }
*/
fun testIdempotent(operation: (Map<String, Int>) -> Map<String, Int>) { fun testIdempotent(operation: (Map<String, Int>) -> Map<String, Int>) {
@@ -383,16 +385,16 @@ class MapTest {
@test fun plusEmptyList() = testIdempotent { it + listOf() } @test fun plusEmptyList() = testIdempotent { it + listOf() }
@test fun minusEmptyList() = testIdempotent { it - listOf() } // @test fun minusEmptyList() = testIdempotent { it - listOf() }
@test fun plusEmptySet() = testIdempotent { it + setOf() } @test fun plusEmptySet() = testIdempotent { it + setOf() }
@test fun minusEmptySet() = testIdempotent { it - setOf() } // @test fun minusEmptySet() = testIdempotent { it - setOf() }
@test fun plusAssignEmptyList() = testIdempotentAssign { it += listOf() } @test fun plusAssignEmptyList() = testIdempotentAssign { it += listOf() }
@test fun minusAssignEmptyList() = testIdempotentAssign { it -= listOf() } // @test fun minusAssignEmptyList() = testIdempotentAssign { it -= listOf() }
@test fun plusAssignEmptySet() = testIdempotentAssign { it += setOf() } @test fun plusAssignEmptySet() = testIdempotentAssign { it += setOf() }
@test fun minusAssignEmptySet() = testIdempotentAssign { it -= setOf() } // @test fun minusAssignEmptySet() = testIdempotentAssign { it -= setOf() }
} }