From 9305903e6c899b8fed90181cf6d0039a05473550 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 3 Nov 2017 21:35:22 +0300 Subject: [PATCH] Remove deprecated pairwise function It was replaced with zipWithNext. --- .../src/core/generated/_CollectionsJs.kt | 12 --------- .../src/core/generated/_SequencesJs.kt | 12 --------- .../src/core/generated/_StringsJs.kt | 12 --------- .../common/src/generated/_Collections.kt | 8 ------ .../stdlib/common/src/generated/_Sequences.kt | 8 ------ .../stdlib/common/src/generated/_Strings.kt | 8 ------ .../stdlib/src/generated/_Collections.kt | 12 --------- libraries/stdlib/src/generated/_Sequences.kt | 12 --------- libraries/stdlib/src/generated/_Strings.kt | 12 --------- .../kotlin-stdlib-runtime-merged.txt | 6 ----- .../reference-public-api/kotlin-stdlib.txt | 6 ----- .../src/templates/Generators.kt | 27 ------------------- 12 files changed, 135 deletions(-) diff --git a/js/js.libraries/src/core/generated/_CollectionsJs.kt b/js/js.libraries/src/core/generated/_CollectionsJs.kt index ae9beb21afb..ad4d47ae579 100644 --- a/js/js.libraries/src/core/generated/_CollectionsJs.kt +++ b/js/js.libraries/src/core/generated/_CollectionsJs.kt @@ -1867,18 +1867,6 @@ public inline fun Iterable.minusElement(element: T): List { return minus(element) } -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public fun Iterable.pairwise(): List> { - return zipWithNext { a, b -> a to b } -} - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public inline fun Iterable.pairwise(transform: (a: T, b: T) -> R): List { - return zipWithNext(transform) -} - /** * Splits the original collection into pair of lists, * where *first* list contains elements for which [predicate] yielded `true`, diff --git a/js/js.libraries/src/core/generated/_SequencesJs.kt b/js/js.libraries/src/core/generated/_SequencesJs.kt index 76c38b5da2b..178a1c873e5 100644 --- a/js/js.libraries/src/core/generated/_SequencesJs.kt +++ b/js/js.libraries/src/core/generated/_SequencesJs.kt @@ -1428,18 +1428,6 @@ public inline fun Sequence.minusElement(element: T): Sequence { return minus(element) } -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public fun Sequence.pairwise(): Sequence> { - return zipWithNext { a, b -> a to b } -} - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public fun Sequence.pairwise(transform: (a: T, b: T) -> R): Sequence { - return zipWithNext(transform) -} - /** * Splits the original sequence into pair of lists, * where *first* list contains elements for which [predicate] yielded `true`, diff --git a/js/js.libraries/src/core/generated/_StringsJs.kt b/js/js.libraries/src/core/generated/_StringsJs.kt index c71f0e5614e..42f60d097e0 100644 --- a/js/js.libraries/src/core/generated/_StringsJs.kt +++ b/js/js.libraries/src/core/generated/_StringsJs.kt @@ -1168,18 +1168,6 @@ public fun CharSequence.chunkedSequence(size: Int, transform: (CharSequence) return windowedSequence(size, size, partialWindows = true, transform = transform) } -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public fun CharSequence.pairwise(): List> { - return zipWithNext { a, b -> a to b } -} - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public inline fun CharSequence.pairwise(transform: (a: Char, b: Char) -> R): List { - return zipWithNext(transform) -} - /** * Splits the original char sequence into pair of char sequences, * where *first* char sequence contains characters for which [predicate] yielded `true`, diff --git a/libraries/stdlib/common/src/generated/_Collections.kt b/libraries/stdlib/common/src/generated/_Collections.kt index 486a16c2993..e1a2f23c91f 100644 --- a/libraries/stdlib/common/src/generated/_Collections.kt +++ b/libraries/stdlib/common/src/generated/_Collections.kt @@ -953,14 +953,6 @@ public expect operator fun Iterable.minus(elements: Sequence): List @kotlin.internal.InlineOnly public expect inline fun Iterable.minusElement(element: T): List -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public expect fun Iterable.pairwise(): List> - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public expect inline fun Iterable.pairwise(transform: (a: T, b: T) -> R): List - /** * Splits the original collection into pair of lists, * where *first* list contains elements for which [predicate] yielded `true`, diff --git a/libraries/stdlib/common/src/generated/_Sequences.kt b/libraries/stdlib/common/src/generated/_Sequences.kt index 7bfbaa5cbae..184cce71e5c 100644 --- a/libraries/stdlib/common/src/generated/_Sequences.kt +++ b/libraries/stdlib/common/src/generated/_Sequences.kt @@ -881,14 +881,6 @@ public expect operator fun Sequence.minus(elements: Sequence): Sequenc @kotlin.internal.InlineOnly public expect inline fun Sequence.minusElement(element: T): Sequence -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public expect fun Sequence.pairwise(): Sequence> - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public expect fun Sequence.pairwise(transform: (a: T, b: T) -> R): Sequence - /** * Splits the original sequence into pair of lists, * where *first* list contains elements for which [predicate] yielded `true`, diff --git a/libraries/stdlib/common/src/generated/_Strings.kt b/libraries/stdlib/common/src/generated/_Strings.kt index 03d068825c3..0eb8458f7e7 100644 --- a/libraries/stdlib/common/src/generated/_Strings.kt +++ b/libraries/stdlib/common/src/generated/_Strings.kt @@ -696,14 +696,6 @@ public expect fun CharSequence.chunkedSequence(size: Int): Sequence @SinceKotlin("1.2") public expect fun CharSequence.chunkedSequence(size: Int, transform: (CharSequence) -> R): Sequence -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public expect fun CharSequence.pairwise(): List> - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public expect inline fun CharSequence.pairwise(transform: (a: Char, b: Char) -> R): List - /** * Splits the original char sequence into pair of char sequences, * where *first* char sequence contains characters for which [predicate] yielded `true`, diff --git a/libraries/stdlib/src/generated/_Collections.kt b/libraries/stdlib/src/generated/_Collections.kt index 500fb466be8..7959d2d7e8c 100644 --- a/libraries/stdlib/src/generated/_Collections.kt +++ b/libraries/stdlib/src/generated/_Collections.kt @@ -1877,18 +1877,6 @@ public inline fun Iterable.minusElement(element: T): List { return minus(element) } -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public fun Iterable.pairwise(): List> { - return zipWithNext { a, b -> a to b } -} - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public inline fun Iterable.pairwise(transform: (a: T, b: T) -> R): List { - return zipWithNext(transform) -} - /** * Splits the original collection into pair of lists, * where *first* list contains elements for which [predicate] yielded `true`, diff --git a/libraries/stdlib/src/generated/_Sequences.kt b/libraries/stdlib/src/generated/_Sequences.kt index 364d3c79954..d48df754850 100644 --- a/libraries/stdlib/src/generated/_Sequences.kt +++ b/libraries/stdlib/src/generated/_Sequences.kt @@ -1450,18 +1450,6 @@ public inline fun Sequence.minusElement(element: T): Sequence { return minus(element) } -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public fun Sequence.pairwise(): Sequence> { - return zipWithNext { a, b -> a to b } -} - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public fun Sequence.pairwise(transform: (a: T, b: T) -> R): Sequence { - return zipWithNext(transform) -} - /** * Splits the original sequence into pair of lists, * where *first* list contains elements for which [predicate] yielded `true`, diff --git a/libraries/stdlib/src/generated/_Strings.kt b/libraries/stdlib/src/generated/_Strings.kt index 99cd3397fc7..099a06368fc 100644 --- a/libraries/stdlib/src/generated/_Strings.kt +++ b/libraries/stdlib/src/generated/_Strings.kt @@ -1176,18 +1176,6 @@ public fun CharSequence.chunkedSequence(size: Int, transform: (CharSequence) return windowedSequence(size, size, partialWindows = true, transform = transform) } -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext()")) -@SinceKotlin("1.2") -public fun CharSequence.pairwise(): List> { - return zipWithNext { a, b -> a to b } -} - -@Deprecated("Use zipWithNext instead", ReplaceWith("zipWithNext(transform)")) -@SinceKotlin("1.2") -public inline fun CharSequence.pairwise(transform: (a: Char, b: Char) -> R): List { - return zipWithNext(transform) -} - /** * Splits the original char sequence into pair of char sequences, * where *first* char sequence contains characters for which [predicate] yielded `true`, diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index d873c29d155..6b7a7013045 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -1668,8 +1668,6 @@ public final class kotlin/collections/CollectionsKt { public static final fun none (Ljava/lang/Iterable;)Z public static final fun none (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Z public static final fun onEach (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Iterable; - public static final fun pairwise (Ljava/lang/Iterable;)Ljava/util/List; - public static final fun pairwise (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)Ljava/util/List; public static final fun partition (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun plus (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List; public static final fun plus (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List; @@ -3590,8 +3588,6 @@ public final class kotlin/sequences/SequencesKt { public static final fun none (Lkotlin/sequences/Sequence;)Z public static final fun none (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Z public static final fun onEach (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence; - public static final fun pairwise (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence; - public static final fun pairwise (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence; public static final fun partition (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun plus (Lkotlin/sequences/Sequence;Ljava/lang/Iterable;)Lkotlin/sequences/Sequence; public static final fun plus (Lkotlin/sequences/Sequence;Ljava/lang/Object;)Lkotlin/sequences/Sequence; @@ -3961,8 +3957,6 @@ public final class kotlin/text/StringsKt { public static final fun padStart (Ljava/lang/String;IC)Ljava/lang/String; public static synthetic fun padStart$default (Ljava/lang/CharSequence;ICILjava/lang/Object;)Ljava/lang/CharSequence; public static synthetic fun padStart$default (Ljava/lang/String;ICILjava/lang/Object;)Ljava/lang/String; - public static final fun pairwise (Ljava/lang/CharSequence;)Ljava/util/List; - public static final fun pairwise (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;)Ljava/util/List; public static final fun partition (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun partition (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun prependIndent (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt index 4d47997bd38..445b7b58177 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt @@ -1527,8 +1527,6 @@ public final class kotlin/collections/CollectionsKt { public static final fun none (Ljava/lang/Iterable;)Z public static final fun none (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Z public static final fun onEach (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Iterable; - public static final fun pairwise (Ljava/lang/Iterable;)Ljava/util/List; - public static final fun pairwise (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)Ljava/util/List; public static final fun partition (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun plus (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List; public static final fun plus (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List; @@ -2285,8 +2283,6 @@ public final class kotlin/sequences/SequencesKt { public static final fun none (Lkotlin/sequences/Sequence;)Z public static final fun none (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Z public static final fun onEach (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence; - public static final fun pairwise (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence; - public static final fun pairwise (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence; public static final fun partition (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun plus (Lkotlin/sequences/Sequence;Ljava/lang/Iterable;)Lkotlin/sequences/Sequence; public static final fun plus (Lkotlin/sequences/Sequence;Ljava/lang/Object;)Lkotlin/sequences/Sequence; @@ -2656,8 +2652,6 @@ public final class kotlin/text/StringsKt { public static final fun padStart (Ljava/lang/String;IC)Ljava/lang/String; public static synthetic fun padStart$default (Ljava/lang/CharSequence;ICILjava/lang/Object;)Ljava/lang/CharSequence; public static synthetic fun padStart$default (Ljava/lang/String;ICILjava/lang/Object;)Ljava/lang/String; - public static final fun pairwise (Ljava/lang/CharSequence;)Ljava/util/List; - public static final fun pairwise (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;)Ljava/util/List; public static final fun partition (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun partition (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair; public static final fun prependIndent (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt index c1798949b3a..c2e44846f37 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt @@ -850,22 +850,6 @@ fun generators(): List { body(CharSequences) { "return chunkedSequence(size) { it.toString() }" } } - templates add f("pairwise(transform: (a: T, b: T) -> R)") { - deprecate(Deprecation("Use zipWithNext instead", "zipWithNext(transform)")) - since("1.2") - only(Iterables, Sequences, CharSequences) - typeParam("R") - returns("List") - inline(true) - body { - """ - return zipWithNext(transform) - """ - } - inline(false, Sequences) - returns(Sequences) { "Sequence" } - } - templates add f("zipWithNext(transform: (a: T, b: T) -> R)") { since("1.2") only(Iterables, Sequences, CharSequences) @@ -927,17 +911,6 @@ fun generators(): List { } } - templates add f("pairwise()") { - deprecate(Deprecation("Use zipWithNext instead", "zipWithNext()")) - since("1.2") - only(Iterables, Sequences, CharSequences) - returns("List>") - returns(Sequences) { "Sequence>" } - body { - "return zipWithNext { a, b -> a to b }" - } - } - templates add f("zipWithNext()") { since("1.2") only(Iterables, Sequences, CharSequences)