diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt index 5c1c56f5845..0135d7c5b4d 100644 --- a/libraries/stdlib/src/kotlin/collections/Maps.kt +++ b/libraries/stdlib/src/kotlin/collections/Maps.kt @@ -25,7 +25,7 @@ private object EmptyMap : Map, Serializable { } /** Returns an empty read-only map of specified type. The returned map is serializable (JVM). */ -public fun emptyMap(): Map = @Suppress("CAST_NEVER_SUCCEEDS") (EmptyMap as Map) +public fun emptyMap(): Map = @Suppress("UNCHECKED_CAST") (EmptyMap as Map) /** * Returns a new read-only map with the specified contents, given as a list of pairs diff --git a/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt b/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt index 391fe56ddf9..84f5c2b435a 100644 --- a/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt +++ b/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt @@ -280,18 +280,18 @@ public inline fun > nullsLast(): Comparator = nullsLast(nat /** * Returns a comparator that compares [Comparable] objects in natural order. */ -public fun > naturalOrder(): Comparator = @Suppress("CAST_NEVER_SUCCEEDS") (NaturalOrderComparator as Comparator) +public fun > naturalOrder(): Comparator = @Suppress("UNCHECKED_CAST") (NaturalOrderComparator as Comparator) /** * Returns a comparator that compares [Comparable] objects in reversed natural order. */ -public fun > reverseOrder(): Comparator = @Suppress("CAST_NEVER_SUCCEEDS") (ReverseOrderComparator as Comparator) +public fun > reverseOrder(): Comparator = @Suppress("UNCHECKED_CAST") (ReverseOrderComparator as Comparator) /** Returns a comparator that imposes the reverse ordering of this comparator. */ public fun Comparator.reversed(): Comparator = when (this) { is ReversedComparator -> this.comparator - NaturalOrderComparator -> @Suppress("CAST_NEVER_SUCCEEDS") (ReverseOrderComparator as Comparator) - ReverseOrderComparator -> @Suppress("CAST_NEVER_SUCCEEDS") (NaturalOrderComparator as Comparator) + NaturalOrderComparator -> @Suppress("UNCHECKED_CAST") (ReverseOrderComparator as Comparator) + ReverseOrderComparator -> @Suppress("UNCHECKED_CAST") (NaturalOrderComparator as Comparator) else -> ReversedComparator(this) }