Skip to content

Commit 36c3ba1

Browse files
committed
Replace internal annotations with ones from 1.3 stdlib
1 parent 706e393 commit 36c3ba1

File tree

24 files changed

+20
-95
lines changed

24 files changed

+20
-95
lines changed

common/kotlinx-coroutines-core-common/src/AbstractContinuation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
package kotlinx.coroutines
66

77
import kotlinx.atomicfu.*
8-
import kotlinx.coroutines.internal.*
98
import kotlin.coroutines.*
109
import kotlin.coroutines.intrinsics.*
10+
import kotlin.jvm.*
1111

1212
private const val UNDECIDED = 0
1313
private const val SUSPENDED = 1

common/kotlinx-coroutines-core-common/src/AbstractCoroutine.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package kotlinx.coroutines
77

88
import kotlinx.coroutines.CoroutineStart.*
9-
import kotlinx.coroutines.internal.*
109
import kotlinx.coroutines.intrinsics.*
1110
import kotlin.coroutines.*
11+
import kotlin.jvm.*
1212

1313
/**
1414
* Abstract base class for implementation of coroutines in coroutine builders.
@@ -37,6 +37,7 @@ public abstract class AbstractCoroutine<in T>(
3737
/**
3838
* Context of the parent coroutine.
3939
*/
40+
4041
@JvmField
4142
protected val parentContext: CoroutineContext,
4243
active: Boolean = true

common/kotlinx-coroutines-core-common/src/Await.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package kotlinx.coroutines
66

77
import kotlinx.atomicfu.*
8-
import kotlinx.coroutines.internal.*
98
import kotlin.coroutines.*
9+
import kotlin.jvm.*
1010

1111
/**
1212
* Awaits for completion of given deferred values without blocking a thread and resumes normally with the list of values

common/kotlinx-coroutines-core-common/src/Builders.common.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import kotlinx.coroutines.intrinsics.*
1313
import kotlinx.coroutines.selects.*
1414
import kotlin.coroutines.*
1515
import kotlin.coroutines.intrinsics.*
16+
import kotlin.jvm.*
1617

1718
// --------------- launch ---------------
1819

common/kotlinx-coroutines-core-common/src/CancellableContinuation.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package kotlinx.coroutines
77
import kotlinx.coroutines.internal.*
88
import kotlin.coroutines.*
99
import kotlin.coroutines.intrinsics.*
10+
import kotlin.jvm.*
1011

1112
// --------------- cancellable continuations ---------------
1213

common/kotlinx-coroutines-core-common/src/CompletedExceptionally.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package kotlinx.coroutines
66

7-
import kotlinx.coroutines.internal.*
87
import kotlin.coroutines.*
8+
import kotlin.jvm.*
99

1010
internal fun <T> Result<T>.toState(): Any? =
1111
if (isSuccess) getOrThrow() else CompletedExceptionally(exceptionOrNull()!!) // todo: need to do it better

common/kotlinx-coroutines-core-common/src/Dispatched.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package kotlinx.coroutines
66

77
import kotlinx.coroutines.internal.*
88
import kotlin.coroutines.*
9+
import kotlin.jvm.*
910

1011
@Suppress("PrivatePropertyName")
1112
private val UNDEFINED = Symbol("UNDEFINED")

common/kotlinx-coroutines-core-common/src/Job.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package kotlinx.coroutines
1010

11-
import kotlinx.coroutines.internal.*
1211
import kotlinx.coroutines.selects.*
1312
import kotlin.coroutines.*
13+
import kotlin.jvm.*
1414

1515
// --------------- core job interfaces ---------------
1616

common/kotlinx-coroutines-core-common/src/JobSupport.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import kotlinx.coroutines.intrinsics.*
1111
import kotlinx.coroutines.selects.*
1212
import kotlin.coroutines.*
1313
import kotlin.coroutines.intrinsics.*
14+
import kotlin.jvm.*
1415

1516
/**
1617
* A concrete implementation of [Job]. It is optionally a child to a parent job.

common/kotlinx-coroutines-core-common/src/Supervisor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
package kotlinx.coroutines
88

9-
import kotlinx.coroutines.internal.*
109
import kotlinx.coroutines.intrinsics.*
1110
import kotlin.coroutines.*
1211
import kotlin.coroutines.intrinsics.*
12+
import kotlin.jvm.*
1313

1414
/**
1515
* Creates a new _supervisor_ job object in an active state.

0 commit comments

Comments
 (0)