Adjust stdlib to contains* transformation

js/js.libraries/src/core/javautil.kt

@@ -14,14 +14,14 @@ public interface Comparator<T> {
 @library
 public abstract class AbstractCollection<E>() : MutableCollection<E> {
     override fun isEmpty(): Boolean = noImpl
-    override fun contains(o: Any?): Boolean = noImpl
+    override fun contains(o: E): Boolean = noImpl
     override fun iterator(): MutableIterator<E> = noImpl
 
     override fun add(e: E): Boolean = noImpl
     override fun remove(o: Any?): Boolean = noImpl
 
     override fun addAll(c: Collection<E>): Boolean = noImpl
-    override fun containsAll(c: Collection<Any?>): Boolean = noImpl
+    override fun containsAll(c: Collection<E>): Boolean = noImpl
     override fun removeAll(c: Collection<Any?>): Boolean = noImpl
     override fun retainAll(c: Collection<Any?>): Boolean = noImpl
 

js/js.libraries/src/core/regex.kt

@@ -180,8 +180,8 @@ private fun RegExp.findNext(input: String, from: Int): MatchResult? {
             override val size: Int get() = match.size()
             override fun isEmpty(): Boolean = size() == 0
 
-            override fun contains(o: Any?): Boolean = this.any { it == o }
-            override fun containsAll(c: Collection<Any?>): Boolean = c.all({contains(it)})
+            override fun contains(o: MatchGroup?): Boolean = this.any { it == o }
+            override fun containsAll(c: Collection<MatchGroup?>): Boolean = c.all({contains(it)})
 
             override fun iterator(): Iterator<MatchGroup?> = indices.asSequence().map { this[it] }.iterator()
 

libraries/stdlib/src/generated/_Arrays.kt

@@ -10176,7 +10176,7 @@ public fun BooleanArray.asList(): List<Boolean> {
     return object : AbstractList<Boolean>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Boolean)
+        override fun contains(o: Boolean): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Boolean> = this@asList.iterator() as MutableIterator<Boolean>
         override fun get(index: Int): Boolean = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Boolean)
@@ -10192,7 +10192,7 @@ public fun ByteArray.asList(): List<Byte> {
     return object : AbstractList<Byte>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Byte)
+        override fun contains(o: Byte): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Byte> = this@asList.iterator() as MutableIterator<Byte>
         override fun get(index: Int): Byte = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Byte)
@@ -10208,7 +10208,7 @@ public fun CharArray.asList(): List<Char> {
     return object : AbstractList<Char>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Char)
+        override fun contains(o: Char): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Char> = this@asList.iterator() as MutableIterator<Char>
         override fun get(index: Int): Char = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Char)
@@ -10224,7 +10224,7 @@ public fun DoubleArray.asList(): List<Double> {
     return object : AbstractList<Double>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Double)
+        override fun contains(o: Double): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Double> = this@asList.iterator() as MutableIterator<Double>
         override fun get(index: Int): Double = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Double)
@@ -10240,7 +10240,7 @@ public fun FloatArray.asList(): List<Float> {
     return object : AbstractList<Float>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Float)
+        override fun contains(o: Float): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Float> = this@asList.iterator() as MutableIterator<Float>
         override fun get(index: Int): Float = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Float)
@@ -10256,7 +10256,7 @@ public fun IntArray.asList(): List<Int> {
     return object : AbstractList<Int>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Int)
+        override fun contains(o: Int): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Int> = this@asList.iterator() as MutableIterator<Int>
         override fun get(index: Int): Int = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Int)
@@ -10272,7 +10272,7 @@ public fun LongArray.asList(): List<Long> {
     return object : AbstractList<Long>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Long)
+        override fun contains(o: Long): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Long> = this@asList.iterator() as MutableIterator<Long>
         override fun get(index: Int): Long = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Long)
@@ -10288,7 +10288,7 @@ public fun ShortArray.asList(): List<Short> {
     return object : AbstractList<Short>(), RandomAccess {
         override val size: Int get() = this@asList.size()
         override fun isEmpty(): Boolean = this@asList.isEmpty()
-        override fun contains(o: Any?): Boolean = this@asList.contains(o as Short)
+        override fun contains(o: Short): Boolean = this@asList.contains(o)
         override fun iterator(): MutableIterator<Short> = this@asList.iterator() as MutableIterator<Short>
         override fun get(index: Int): Short = this@asList[index]
         override fun indexOf(o: Any?): Int = this@asList.indexOf(o as Short)

libraries/stdlib/src/kotlin/collections/JUtil.kt

@@ -22,8 +22,8 @@ internal object EmptyList : List<Nothing>, Serializable {
 
     override val size: Int get() = 0
     override fun isEmpty(): Boolean = true
-    override fun contains(o: Any?): Boolean = false
-    override fun containsAll(c: Collection<Any?>): Boolean = c.isEmpty()
+    override fun contains(o: Nothing): Boolean = false
+    override fun containsAll(c: Collection<Nothing>): Boolean = c.isEmpty()
 
     override fun get(index: Int): Nothing = throw IndexOutOfBoundsException("Index $index is out of bound of empty list.")
     override fun indexOf(o: Any?): Int = -1

libraries/stdlib/src/kotlin/collections/Sets.kt

@@ -14,8 +14,8 @@ internal object EmptySet : Set<Nothing>, Serializable {
 
     override val size: Int get() = 0
     override fun isEmpty(): Boolean = true
-    override fun contains(o: Any?): Boolean = false
-    override fun containsAll(c: Collection<Any?>): Boolean = c.isEmpty()
+    override fun contains(o: Nothing): Boolean = false
+    override fun containsAll(c: Collection<Nothing>): Boolean = c.isEmpty()
 
     override fun iterator(): Iterator<Nothing> = EmptyIterator
 

libraries/stdlib/src/kotlin/dom/Dom.kt

@@ -232,7 +232,6 @@ private class ElementListAsList(private val nodeList: NodeList) : AbstractList<E
     }
 
     override val size: Int get() = nodeList.length
-
 }
 
 /** Returns an [Iterator] over the next siblings of this node */

libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt

@@ -222,8 +222,8 @@ private class MatcherMatchResult(private val matcher: Matcher, private val input
     override val groups: MatchGroupCollection = object : MatchGroupCollection {
         override val size: Int get() = matchResult.groupCount() + 1
         override fun isEmpty(): Boolean = false
-        override fun contains(o: Any?): Boolean = o is MatchGroup? && this.any({ it == o })
-        override fun containsAll(c: Collection<Any?>): Boolean = c.all({contains(it)})
+        override fun contains(o: MatchGroup?): Boolean = this.any({ it == o })
+        override fun containsAll(c: Collection<MatchGroup?>): Boolean = c.all({contains(it)})
 
         override fun iterator(): Iterator<MatchGroup?> = indices.asSequence().map { this[it] }.iterator()
         override fun get(index: Int): MatchGroup? {

libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt

@@ -230,7 +230,7 @@ fun specialJVM(): List<GenericFunction> {
             return object : AbstractList<T>(), RandomAccess {
                 override val size: Int get() = this@asList.size()
                 override fun isEmpty(): Boolean = this@asList.isEmpty()
-                override fun contains(o: Any?): Boolean = this@asList.contains(o as T)
+                override fun contains(o: T): Boolean = this@asList.contains(o)
                 override fun iterator(): MutableIterator<T> = this@asList.iterator() as MutableIterator<T>
                 override fun get(index: Int): T = this@asList[index]
                 override fun indexOf(o: Any?): Int = this@asList.indexOf(o as T)