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

Temporary drop mapNotNull and mapNotNullTo.

Browse Source 
Disable mapNotNull tests

#KT-4410
This commit is contained in:
Ilya Gorbunov
2015-10-30 17:14:04 +03:00
parent b71fec985f
commit 65a98d6968
6 changed files with 8 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Arrays.kt
-22
View File
@@ -6545,28 +6545,6 @@ public inline fun <R, C : MutableCollection<in R>> ShortArray.mapIndexedTo(desti
return destination
}
/**
* Returns a list containing the results of applying the given [transform] function to each non-null element of the original collection.
*/
@Deprecated("This function will change its semantics soon to map&filter rather than filter&map. Use filterNotNull().map {} instead.", ReplaceWith("filterNotNull().map(transform)"))
public inline fun <T : Any, R> Array<out T?>.mapNotNull(transform: (T) -> R): List<R> {
return mapNotNullTo(ArrayList<R>(), transform)
}
/**
* Appends transformed non-null elements of original collection using the given [transform] function
* to the given [destination].
*/
@Deprecated("This function will change its semantics soon to map&filter rather than filter&map. Use filterNotNull().mapTo(destination) {} instead.", ReplaceWith("filterNotNull().mapTo(destination, transform)"))
public inline fun <T : Any, R, C : MutableCollection<in R>> Array<out T?>.mapNotNullTo(destination: C, transform: (T) -> R): C {
for (element in this) {
if (element != null) {
destination.add(transform(element))
}
}
return destination
}
/**
* Appends transformed elements of the original collection using the given [transform] function
* to the given [destination].
libraries/stdlib/src/generated/_Collections.kt
-22
View File
@@ -1081,28 +1081,6 @@ public inline fun <T, R, C : MutableCollection<in R>> Iterable<T>.mapIndexedTo(d
return destination
}
/**
* Returns a list containing the results of applying the given [transform] function to each non-null element of the original collection.
*/
@Deprecated("This function will change its semantics soon to map&filter rather than filter&map. Use filterNotNull().map {} instead.", ReplaceWith("filterNotNull().map(transform)"))
public inline fun <T : Any, R> Iterable<T?>.mapNotNull(transform: (T) -> R): List<R> {
return mapNotNullTo(ArrayList<R>(), transform)
}
/**
* Appends transformed non-null elements of original collection using the given [transform] function
* to the given [destination].
*/
@Deprecated("This function will change its semantics soon to map&filter rather than filter&map. Use filterNotNull().mapTo(destination) {} instead.", ReplaceWith("filterNotNull().mapTo(destination, transform)"))
public inline fun <T : Any, R, C : MutableCollection<in R>> Iterable<T?>.mapNotNullTo(destination: C, transform: (T) -> R): C {
for (element in this) {
if (element != null) {
destination.add(transform(element))
}
}
return destination
}
/**
* Appends transformed elements of the original collection using the given [transform] function
* to the given [destination].
libraries/stdlib/src/generated/_Sequences.kt
-22
View File
@@ -606,28 +606,6 @@ public inline fun <T, R, C : MutableCollection<in R>> Sequence<T>.mapIndexedTo(d
return destination
}
/**
* Returns a sequence containing the results of applying the given [transform] function to each non-null element of the original sequence.
*/
@Deprecated("This function will change its semantics soon to map&filter rather than filter&map. Use filterNotNull().map {} instead.", ReplaceWith("filterNotNull().map(transform)"))
public fun <T : Any, R> Sequence<T?>.mapNotNull(transform: (T) -> R): Sequence<R> {
return TransformingSequence(FilteringSequence(this, false, { it == null }) as Sequence<T>, transform)
}
/**
* Appends transformed non-null elements of original collection using the given [transform] function
* to the given [destination].
*/
@Deprecated("This function will change its semantics soon to map&filter rather than filter&map. Use filterNotNull().mapTo(destination) {} instead.", ReplaceWith("filterNotNull().mapTo(destination, transform)"))
public inline fun <T : Any, R, C : MutableCollection<in R>> Sequence<T?>.mapNotNullTo(destination: C, transform: (T) -> R): C {
for (element in this) {
if (element != null) {
destination.add(transform(element))
}
}
return destination
}
/**
* Appends transformed elements of the original collection using the given [transform] function
* to the given [destination].
libraries/stdlib/test/collections/CollectionTest.kt
+2
View File
@@ -36,6 +36,7 @@ class CollectionTest {
}
}
/*
@test fun mapNotNull() {
val data = listOf(null, "foo", null, "bar")
val foo = data.mapNotNull { it.length() }
@@ -46,6 +47,7 @@ class CollectionTest {
foo is List<Int>
}
}
*/
@test fun listOfNotNull() {
val l1: List<Int> = listOfNotNull(null)
libraries/stdlib/test/collections/SequenceTest.kt
+2
View File
@@ -63,6 +63,7 @@ public class SequenceTest {
assertEquals(listOf("foo", "bar"), filtered.toList())
}
/*
@test fun mapNotNull() {
val data = sequenceOf(null, "foo", null, "bar")
val foo = data.mapNotNull { it.length() }
@@ -72,6 +73,7 @@ public class SequenceTest {
foo is Sequence<Int>
}
}
*/
@test fun mapIndexed() {
assertEquals(listOf(0, 1, 2, 6, 12), fibonacci().mapIndexed { index, value -> index * value }.takeWhile { i: Int -> i < 20 }.toList())
libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt
+4
View File
@@ -71,6 +71,7 @@ fun mapping(): List<GenericFunction> {
include(Maps)
}
/*
templates add f("mapNotNull(transform: (T) -> R)") {
inline(true)
exclude(Strings, ArraysOfPrimitives)
@@ -95,6 +96,7 @@ fun mapping(): List<GenericFunction> {
"""
}
}
*/
templates add f("mapTo(destination: C, transform: (T) -> R)") {
inline(true)
@@ -143,6 +145,7 @@ fun mapping(): List<GenericFunction> {
include(Maps)
}
/*
templates add f("mapNotNullTo(destination: C, transform: (T) -> R)") {
inline(true)
exclude(Strings, ArraysOfPrimitives)
@@ -170,6 +173,7 @@ fun mapping(): List<GenericFunction> {
"""
}
}
*/
templates add f("flatMap(transform: (T) -> Iterable<R>)") {
inline(true)