From 418114240032b037fb94fb886066d35975086e81 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 26 Nov 2015 00:39:45 +0300 Subject: [PATCH] Deprecate sequenceOf(Progression). --- libraries/stdlib/src/kotlin/collections/Sequence.kt | 1 + libraries/stdlib/test/collections/SequenceTest.kt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/src/kotlin/collections/Sequence.kt b/libraries/stdlib/src/kotlin/collections/Sequence.kt index 3727793cfac..c1152f82b7e 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequence.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequence.kt @@ -42,6 +42,7 @@ public fun sequenceOf(vararg elements: T): Sequence = if (elements.isEmpt /** * Creates a sequence that returns all values in the specified [progression]. */ +@Deprecated("Use progression.asSequence() instead.", ReplaceWith("progression.asSequence()")) public fun sequenceOf(progression: Progression): Sequence = object : Sequence { override fun iterator(): Iterator = progression.iterator() } diff --git a/libraries/stdlib/test/collections/SequenceTest.kt b/libraries/stdlib/test/collections/SequenceTest.kt index 4b8382cf958..35af6513cd7 100644 --- a/libraries/stdlib/test/collections/SequenceTest.kt +++ b/libraries/stdlib/test/collections/SequenceTest.kt @@ -304,17 +304,17 @@ public class SequenceTest { } @test fun flatMap() { - val result = sequenceOf(1, 2).flatMap { sequenceOf(0..it) } + val result = sequenceOf(1, 2).flatMap { (0..it).asSequence() } assertEquals(listOf(0, 1, 0, 1, 2), result.toList()) } @test fun flatMapOnEmpty() { - val result = sequenceOf().flatMap { sequenceOf(0..it) } + val result = sequenceOf().flatMap { (0..it).asSequence() } assertTrue(result.none()) } @test fun flatMapWithEmptyItems() { - val result = sequenceOf(1, 2, 4).flatMap { if (it == 2) sequenceOf() else sequenceOf(it - 1..it) } + val result = sequenceOf(1, 2, 4).flatMap { if (it == 2) sequenceOf() else (it - 1..it).asSequence() } assertEquals(listOf(0, 1, 3, 4), result.toList()) }