From 263e1b4b5d4cfd7a1c73263ad2d88ffeee3b0048 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 26 Jan 2016 22:08:39 +0300 Subject: [PATCH] Drop deprecated mapIndexedTo on Maps. --- libraries/stdlib/src/generated/_Maps.kt | 12 ------------ .../tools/kotlin-stdlib-gen/src/templates/Mapping.kt | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/libraries/stdlib/src/generated/_Maps.kt b/libraries/stdlib/src/generated/_Maps.kt index 2157fdb9a63..a426b8ad588 100644 --- a/libraries/stdlib/src/generated/_Maps.kt +++ b/libraries/stdlib/src/generated/_Maps.kt @@ -49,18 +49,6 @@ public inline fun Map.map(transform: (Map.Entry) -> R): Li return mapTo(ArrayList(size), transform) } -/** - * Applies the given [transform] function to each entry and its index in the original map - * and appends the results to the given [destination]. - */ -@Deprecated("Use entries.mapIndexedTo instead.", ReplaceWith("this.entries.mapIndexedTo(destination, transform)")) -public inline fun > Map.mapIndexedTo(destination: C, transform: (Int, Map.Entry) -> R): C { - var index = 0 - for (item in this) - destination.add(transform(index++, item)) - return destination -} - /** * Returns a list containing only the non-null results of applying the given [transform] function * to each entry in the original map. diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt index 6db8d27f5c7..c051f1660d1 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt @@ -170,8 +170,7 @@ fun mapping(): List { return destination """ } - deprecate(Maps) { Deprecation("Use entries.mapIndexedTo instead.", replaceWith = "this.entries.mapIndexedTo(destination, transform)") } - include(Maps, CharSequences) + include(CharSequences) } templates add f("mapNotNullTo(destination: C, transform: (T) -> R?)") {