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

Change removeAll extension implementation to match the contract of member removeAll.

Browse Source 
Add retainAll for sequences.
This commit is contained in:
Ilya Gorbunov
2015-07-08 21:10:33 +03:00
parent ecba29a08a
commit 0ee960da50
3 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/MutableCollections.kt
+15 -8
View File
@@ -47,31 +47,31 @@ public fun <T> MutableCollection<in T>.addAll(array: Array<out T>) {
}
/**
* Removes all elements of the given [iterable] from this [MutableCollection].
* Removes all elements from this [MutableCollection] that are also contained in the given [iterable].
*/
public fun <T> MutableCollection<in T>.removeAll(iterable: Iterable<T>) {
when (iterable) {
is Collection -> removeAll(iterable)
else -> for (item in iterable) remove(item)
else -> removeAll(iterable.toHashSet())
}
}
/**
* Removes all elements of the given [sequence] from this [MutableCollection].
* Removes all elements from this [MutableCollection] that are also contained in the given [sequence].
*/
public fun <T> MutableCollection<in T>.removeAll(sequence: Sequence<T>) {
for (item in sequence) remove(item)
removeAll(sequence.toHashSet())
}
/**
* Removes all elements of the given [array] from this [MutableCollection].
* Removes all elements from this [MutableCollection] that are also contained in the given [array].
*/
public fun <T> MutableCollection<in T>.removeAll(array: Array<out T>) {
for (item in array) remove(item)
removeAll(array.toHashSet())
}
/**
* Retains only elements of the given [iterable] in this [MutableCollection].
* Retains only elements of this [MutableCollection] that are contained in the given [iterable].
*/
public fun <T> MutableCollection<in T>.retainAll(iterable: Iterable<T>) {
when (iterable) {
@@ -81,8 +81,15 @@ public fun <T> MutableCollection<in T>.retainAll(iterable: Iterable<T>) {
}
/**
* Retains only elements of the given [array] in this [MutableCollection].
* Retains only elements of this [MutableCollection] that are contained in the given [array].
*/
public fun <T> MutableCollection<in T>.retainAll(array: Array<out T>) {
retainAll(array.toHashSet())
}
/**
* Retains only elements of this [MutableCollection] that are contained in the given [sequence].
*/
public fun <T> MutableCollection<in T>.retainAll(sequence: Sequence<T>) {
retainAll(sequence.toHashSet())
}