diff options
| author | Vsevolod Tolstopyatov <qwwdfsad@gmail.com> | 2021-02-15 16:29:32 +0300 |
|---|---|---|
| committer | Vsevolod Tolstopyatov <qwwdfsad@gmail.com> | 2021-02-15 16:29:32 +0300 |
| commit | 88b096699683f93ef20d75cf925adae1c7065198 (patch) | |
| tree | aa6cd2af8cf13cf3c48d907dae27fa7d2b1d1648 | |
| parent | ba33cfc56c53ee39db2e3147f00f11dfe6d3cea2 (diff) | |
| parent | 66fe1c8eb99ef1464248e291adfaa647e85a4e24 (diff) | |
| download | kotlinx.coroutines-88b096699683f93ef20d75cf925adae1c7065198.tar.gz | |
Merge branch 'master' into develop
3 files changed, 4 insertions, 4 deletions
diff --git a/kotlinx-coroutines-core/common/src/channels/Channel.kt b/kotlinx-coroutines-core/common/src/channels/Channel.kt index 8eaa1cfe..b8b81aac 100644 --- a/kotlinx-coroutines-core/common/src/channels/Channel.kt +++ b/kotlinx-coroutines-core/common/src/channels/Channel.kt @@ -90,7 +90,7 @@ public interface SendChannel<in E> { /** * Closes this channel. * This is an idempotent operation — subsequent invocations of this function have no effect and return `false`. - * Conceptually, its sends a special "close token" over this channel. + * Conceptually, it sends a special "close token" over this channel. * * Immediately after invocation of this function, * [isClosedForSend] starts returning `true`. However, [isClosedForReceive][ReceiveChannel.isClosedForReceive] @@ -498,7 +498,7 @@ public interface ChannelIterator<out E> { * * When `capacity` is [Channel.CONFLATED] — it creates a _conflated_ channel * This channel buffers at most one element and conflates all subsequent `send` and `offer` invocations, * so that the receiver always gets the last element sent. - * Back-to-send sent elements are conflated — only the last sent element is received, + * Back-to-back sent elements are conflated — only the last sent element is received, * while previously sent elements **are lost**. * [Sending][send] to this channel never suspends, and [offer] always returns `true`. * diff --git a/kotlinx-coroutines-core/common/src/flow/operators/Context.kt b/kotlinx-coroutines-core/common/src/flow/operators/Context.kt index 8ed456d8..cbbb4196 100644 --- a/kotlinx-coroutines-core/common/src/flow/operators/Context.kt +++ b/kotlinx-coroutines-core/common/src/flow/operators/Context.kt @@ -181,7 +181,7 @@ public fun <T> Flow<T>.buffer(capacity: Int = BUFFERED): Flow<T> = buffer(capaci * **Conflation takes precedence over `buffer()` calls with any other capacity.** * * Note that any instance of [StateFlow] already behaves as if `conflate` operator is - * applied to it, so applying `conflate` to a `StateFlow` has not effect. + * applied to it, so applying `conflate` to a `StateFlow` has no effect. * See [StateFlow] documentation on Operator Fusion. */ public fun <T> Flow<T>.conflate(): Flow<T> = buffer(CONFLATED) diff --git a/kotlinx-coroutines-core/common/src/flow/operators/Merge.kt b/kotlinx-coroutines-core/common/src/flow/operators/Merge.kt index b6ed3c91..04275375 100644 --- a/kotlinx-coroutines-core/common/src/flow/operators/Merge.kt +++ b/kotlinx-coroutines-core/common/src/flow/operators/Merge.kt @@ -34,7 +34,7 @@ public val DEFAULT_CONCURRENCY: Int = systemProp(DEFAULT_CONCURRENCY_PROPERTY_NA * Transforms elements emitted by the original flow by applying [transform], that returns another flow, * and then concatenating and flattening these flows. * - * This method is is a shortcut for `map(transform).flattenConcat()`. See [flattenConcat]. + * This method is a shortcut for `map(transform).flattenConcat()`. See [flattenConcat]. * * Note that even though this operator looks very familiar, we discourage its usage in a regular application-specific flows. * Most likely, suspending operation in [map] operator will be sufficient and linear transformations are much easier to reason about. |