Skip to content

Commit 26085d7

Browse files
woainikkwoainikk
authored
Merge pull request #3906 from Kotlin/bobko/MR/error-to-warning
"member scope mismatch for open expect" was downgraded from error to warning
2 parents 1fc8c37 + 64d8874 commit 26085d7

File tree

9 files changed

+34
-34
lines changed

9 files changed

+34
-34
lines changed

‎kotlinx-coroutines-core/concurrent/src/CompletionHandler.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlinx.coroutines.internal.*
99
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
1010
// New 'CompletionHandler` supertype is added compared to the expect declaration.
1111
// Probably we can add it to JS and common too, to avoid the suppression/opt-in
12-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER")
12+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1313
internal actual abstract class CompletionHandlerBase actual constructor() : LockFreeLinkedListNode(), CompletionHandler {
1414
actual abstract override fun invoke(cause: Throwable?)
1515
}
@@ -19,7 +19,7 @@ internal actual inline val CompletionHandlerBase.asHandler: CompletionHandler ge
1919
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
2020
// New 'CompletionHandler` supertype is added compared to the expect declaration.
2121
// Probably we can add it to JS and common too, to avoid the suppression/opt-in
22-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER")
22+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
2323
internal actual abstract class CancelHandlerBase actual constructor() : CompletionHandler {
2424
actual abstract override fun invoke(cause: Throwable?)
2525
}

‎kotlinx-coroutines-core/concurrent/src/internal/LockFreeLinkedList.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ internal val CONDITION_FALSE: Any = Symbol("CONDITION_FALSE")
4545
@Suppress(
4646
"LeakingThis",
4747
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
48-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER"
48+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
4949
)
5050
@InternalCoroutinesApi
5151
public actual open class LockFreeLinkedListNode {
@@ -73,19 +73,19 @@ public actual open class LockFreeLinkedListNode {
7373
}
7474

7575
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
76-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
76+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
7777
@PublishedApi
7878
internal inline fun makeCondAddOp(node: Node, crossinline condition: () -> Boolean): CondAddOp =
7979
object : CondAddOp(node) {
8080
override fun prepare(affected: Node): Any? = if (condition()) null else CONDITION_FALSE
8181
}
8282

8383
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
84-
@Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION")
84+
@Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION_WARNING")
8585
public actual open val isRemoved: Boolean get() = next is Removed
8686

8787
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
88-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
88+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
8989
// LINEARIZABLE. Returns Node | Removed
9090
public val next: Any get() {
9191
_next.loop { next ->
@@ -177,7 +177,7 @@ public actual open class LockFreeLinkedListNode {
177177
* Returns `false` if `next` was not following `this` node.
178178
*/
179179
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
180-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
180+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
181181
@PublishedApi
182182
internal fun addNext(node: Node, next: Node): Boolean {
183183
node._prev.lazySet(this)
@@ -189,7 +189,7 @@ public actual open class LockFreeLinkedListNode {
189189
}
190190

191191
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
192-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
192+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
193193
// returns UNDECIDED, SUCCESS or FAILURE
194194
@PublishedApi
195195
internal fun tryCondAddNext(node: Node, next: Node, condAdd: CondAddOp): Int {
@@ -214,7 +214,7 @@ public actual open class LockFreeLinkedListNode {
214214
removeOrNext() == null
215215

216216
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
217-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
217+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
218218
// returns null if removed successfully or next node if this node is already removed
219219
@PublishedApi
220220
internal fun removeOrNext(): Node? {
@@ -272,7 +272,7 @@ public actual open class LockFreeLinkedListNode {
272272
}
273273

274274
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
275-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
275+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
276276
protected open fun nextIfRemoved(): Node? = (next as? Removed)?.ref
277277

278278
/**
@@ -330,7 +330,7 @@ public actual open class LockFreeLinkedListNode {
330330
}
331331

332332
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
333-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
333+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
334334
internal fun validateNode(prev: Node, next: Node) {
335335
assert { prev === this._prev.value }
336336
assert { next === this._next.value }
@@ -352,7 +352,7 @@ internal fun Any.unwrap(): Node = (this as? Removed)?.ref ?: this as Node
352352
* @suppress **This is unstable API and it is subject to change.**
353353
*/
354354
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
355-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
355+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
356356
public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
357357
public actual val isEmpty: Boolean get() = next === this
358358

@@ -378,7 +378,7 @@ public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
378378
override fun nextIfRemoved(): Node? = null
379379

380380
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
381-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
381+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
382382
internal fun validate() {
383383
var prev: Node = this
384384
var cur: Node = next as Node

‎kotlinx-coroutines-core/js/src/internal/LinkedList.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ private typealias Node = LinkedListNode
1414
// :TODO: Remove when fixed: https://youtrack.jetbrains.com/issue/KT-23703
1515
"NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS",
1616
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
17-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER",
17+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING",
1818
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
19-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER"
19+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
2020
)
2121
public actual typealias LockFreeLinkedListNode = LinkedListNode
2222

‎kotlinx-coroutines-core/jvm/src/EventLoop.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import kotlinx.coroutines.scheduling.*
99
import kotlinx.coroutines.scheduling.CoroutineScheduler
1010

1111
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
12-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
12+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1313
internal actual abstract class EventLoopImplPlatform: EventLoop() {
1414
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
15-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
15+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
1616
protected abstract val thread: Thread
1717

1818
protected actual fun unpark() {
@@ -22,7 +22,7 @@ internal actual abstract class EventLoopImplPlatform: EventLoop() {
2222
}
2323

2424
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
25-
@Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION")
25+
@Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION_WARNING")
2626
protected actual open fun reschedule(now: Long, delayedTask: EventLoopImplBase.DelayedTask) {
2727
DefaultExecutor.schedule(now, delayedTask)
2828
}

‎kotlinx-coroutines-core/jvm/src/Executors.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public abstract class ExecutorCoroutineDispatcher: CoroutineDispatcher(), Closea
3939

4040
@Suppress(
4141
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
42-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER",
42+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING",
4343
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
44-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER"
44+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
4545
)
4646
@ExperimentalCoroutinesApi
4747
public actual typealias CloseableCoroutineDispatcher = ExecutorCoroutineDispatcher

‎kotlinx-coroutines-core/jvm/src/SchedulerTask.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ package kotlinx.coroutines
77
import kotlinx.coroutines.scheduling.*
88

99
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
10-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
10+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1111
internal actual typealias SchedulerTask = Task
1212

1313
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
14-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
14+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1515
internal actual typealias SchedulerTaskContext = TaskContext
1616

1717
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")

‎kotlinx-coroutines-core/jvm/test/TestBase.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public actual typealias TestResult = Unit
5656
*/
5757
@Suppress(
5858
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
59-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER"
59+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
6060
)
6161
public actual open class TestBase(private var disableOutCheck: Boolean) {
6262

@@ -89,7 +89,7 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
8989
}
9090

9191
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
92-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
92+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
9393
public fun hasError() = error.get() != null
9494

9595
private fun makeError(message: Any, cause: Throwable? = null): IllegalStateException =
@@ -114,7 +114,7 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
114114
* test will not complete successfully even if this exception is consumed somewhere in the test.
115115
*/
116116
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
117-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
117+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
118118
public inline fun check(value: Boolean, lazyMessage: () -> Any) {
119119
if (!value) error(lazyMessage())
120120
}
@@ -163,15 +163,15 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
163163
})
164164

165165
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
166-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
166+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
167167
fun println(message: Any?) {
168168
if (disableOutCheck) kotlin.io.println(message)
169169
else previousOut.println(message)
170170
}
171171

172172
@Before
173173
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
174-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
174+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
175175
fun before() {
176176
initPoolsBeforeTest()
177177
threadsBefore = currentThreads()
@@ -188,7 +188,7 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
188188
}
189189

190190
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
191-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
191+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
192192
@After
193193
fun onCompletion() {
194194
// onCompletion should not throw exceptions before it finishes all cleanup, so that other tests always
@@ -217,13 +217,13 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
217217
}
218218

219219
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
220-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
220+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
221221
fun initPoolsBeforeTest() {
222222
DefaultScheduler.usePrivateScheduler()
223223
}
224224

225225
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
226-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
226+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
227227
fun shutdownPoolsAfterTest() {
228228
DefaultScheduler.shutdown(SHUTDOWN_TIMEOUT)
229229
DefaultExecutor.shutdownForTests(SHUTDOWN_TIMEOUT)
@@ -266,15 +266,15 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
266266
}
267267

268268
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
269-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
269+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
270270
protected inline fun <reified T: Throwable> assertFailsWith(block: () -> Unit): T {
271271
val result = runCatching(block)
272272
assertTrue(result.exceptionOrNull() is T, "Expected ${T::class}, but had $result")
273273
return result.exceptionOrNull()!! as T
274274
}
275275

276276
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
277-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
277+
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
278278
protected suspend fun currentDispatcher() = coroutineContext[ContinuationInterceptor]!!
279279
}
280280

‎kotlinx-coroutines-core/native/src/internal/Synchronized.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlinx.atomicfu.locks.withLock as withLock2
1212
*/
1313
@InternalCoroutinesApi
1414
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
15-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
15+
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1616
public actual typealias SynchronizedObject = kotlinx.atomicfu.locks.SynchronizedObject
1717

1818
/**

‎kotlinx-coroutines-core/native/test/ConcurrentTestUtilities.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private object BlackHole {
2727

2828
@Suppress(
2929
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
30-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER",
30+
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING",
3131
)
3232
internal actual typealias SuppressSupportingThrowable = SuppressSupportingThrowableImpl
3333

0 commit comments

Comments
 (0)