diff --git a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableCollection.kt b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableCollection.kt index 82ca6735b01..0bcba06c9ed 100644 --- a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableCollection.kt +++ b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableCollection.kt @@ -8,7 +8,7 @@ package kotlin.collections /** * Provides a skeletal implementation of the [MutableCollection] interface. * - * @param E the type of elements contained in the collection. The collection is invariant on its element type. + * @param E the type of elements contained in the collection. The collection is invariant in its element type. */ public actual abstract class AbstractMutableCollection protected actual constructor(): MutableCollection, AbstractCollection() { diff --git a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableList.kt b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableList.kt index fdcd6b71e73..1ac07d505a8 100644 --- a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableList.kt +++ b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableList.kt @@ -15,7 +15,7 @@ package kotlin.collections /** * Provides a skeletal implementation of the [MutableList] interface. * - * @param E the type of elements contained in the list. The list is invariant on its element type. + * @param E the type of elements contained in the list. The list is invariant in its element type. */ public actual abstract class AbstractMutableList protected actual constructor() : AbstractMutableCollection(), MutableList { protected var modCount: Int = 0 diff --git a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableMap.kt b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableMap.kt index 8dc29978e54..46f0a65f1f2 100644 --- a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableMap.kt +++ b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableMap.kt @@ -5,8 +5,8 @@ package kotlin.collections * * The implementor is required to implement [entries] property, which should return mutable set of map entries, and [put] function. * - * @param K the type of map keys. The map is invariant on its key type. - * @param V the type of map values. The map is invariant on its value type. + * @param K the type of map keys. The map is invariant in its key type. + * @param V the type of map values. The map is invariant in its value type. */ @SinceKotlin("1.1") public actual abstract class AbstractMutableMap protected actual constructor() : AbstractMap(), MutableMap { diff --git a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableSet.kt b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableSet.kt index 986ed7134ae..47da186ccb6 100644 --- a/runtime/src/main/kotlin/kotlin/collections/AbstractMutableSet.kt +++ b/runtime/src/main/kotlin/kotlin/collections/AbstractMutableSet.kt @@ -3,7 +3,7 @@ package kotlin.collections /** * Provides a skeletal implementation of the [MutableSet] interface. * - * @param E the type of elements contained in the set. The set is invariant on its element type. + * @param E the type of elements contained in the set. The set is invariant in its element type. */ @SinceKotlin("1.1") public actual abstract class AbstractMutableSet protected actual constructor() : AbstractMutableCollection(), MutableSet { diff --git a/runtime/src/main/kotlin/kotlin/collections/Collection.kt b/runtime/src/main/kotlin/kotlin/collections/Collection.kt index be8642f5187..c2935df785d 100644 --- a/runtime/src/main/kotlin/kotlin/collections/Collection.kt +++ b/runtime/src/main/kotlin/kotlin/collections/Collection.kt @@ -8,7 +8,7 @@ package kotlin.collections /** * A generic collection of elements. Methods in this interface support only read-only access to the collection; * read/write access is supported through the [MutableCollection] interface. - * @param E the type of elements contained in the collection. The collection is covariant on its element type. + * @param E the type of elements contained in the collection. The collection is covariant in its element type. */ public interface Collection : Iterable { // Query Operations @@ -38,7 +38,7 @@ public interface Collection : Iterable { /** * A generic collection of elements that supports adding and removing elements. * - * @param E the type of elements contained in the collection. The mutable collection is invariant on its element type. + * @param E the type of elements contained in the collection. The mutable collection is invariant in its element type. */ public interface MutableCollection : Collection, MutableIterable { // Query Operations diff --git a/runtime/src/main/kotlin/kotlin/collections/Collections.kt b/runtime/src/main/kotlin/kotlin/collections/Collections.kt index 90097a88400..3eb094f28da 100644 --- a/runtime/src/main/kotlin/kotlin/collections/Collections.kt +++ b/runtime/src/main/kotlin/kotlin/collections/Collections.kt @@ -19,7 +19,7 @@ internal actual fun Array.copyToArrayOfAny(isVarargs: Boolean): Array /** * Classes that inherit from this interface can be represented as a sequence of elements that can * be iterated over. - * @param T the type of element being iterated over. The iterator is covariant on its element type. + * @param T the type of element being iterated over. The iterator is covariant in its element type. */ public interface Iterable { /** @@ -31,7 +31,7 @@ public interface Iterable { /** * Classes that inherit from this interface can be represented as a sequence of elements that can * be iterated over and that supports removing elements during iteration. - * @param T the type of element being iterated over. The mutable iterator is invariant on its element type. + * @param T the type of element being iterated over. The mutable iterator is invariant in its element type. */ public interface MutableIterable : Iterable { /** diff --git a/runtime/src/main/kotlin/kotlin/collections/List.kt b/runtime/src/main/kotlin/kotlin/collections/List.kt index 528192d3278..ace36b768a7 100644 --- a/runtime/src/main/kotlin/kotlin/collections/List.kt +++ b/runtime/src/main/kotlin/kotlin/collections/List.kt @@ -8,7 +8,7 @@ package kotlin.collections /** * A generic ordered collection of elements. Methods in this interface support only read-only access to the list; * read/write access is supported through the [MutableList] interface. - * @param E the type of elements contained in the list. The list is covariant on its element type. + * @param E the type of elements contained in the list. The list is covariant in its element type. */ public interface List : Collection { // Query Operations @@ -62,7 +62,7 @@ public interface List : Collection { /** * A generic ordered collection of elements that supports adding and removing elements. - * @param E the type of elements contained in the list. The mutable list is invariant on its element type. + * @param E the type of elements contained in the list. The mutable list is invariant in its element type. */ public interface MutableList : List, MutableCollection { // Modification Operations diff --git a/runtime/src/main/kotlin/kotlin/collections/Map.kt b/runtime/src/main/kotlin/kotlin/collections/Map.kt index f85f85b6420..076a179b3c5 100644 --- a/runtime/src/main/kotlin/kotlin/collections/Map.kt +++ b/runtime/src/main/kotlin/kotlin/collections/Map.kt @@ -10,9 +10,9 @@ package kotlin.collections * the value corresponding to each key. Map keys are unique; the map holds only one value for each key. * Methods in this interface support only read-only access to the map; read-write access is supported through * the [MutableMap] interface. - * @param K the type of map keys. The map is invariant on its key type, as it + * @param K the type of map keys. The map is invariant in its key type, as it * can accept key as a parameter (of [containsKey] for example) and return it in [keys] set. - * @param V the type of map values. The map is covariant on its value type. + * @param V the type of map values. The map is covariant in its value type. */ public interface Map { // Query Operations @@ -76,8 +76,8 @@ public interface Map { /** * A modifiable collection that holds pairs of objects (keys and values) and supports efficiently retrieving * the value corresponding to each key. Map keys are unique; the map holds only one value for each key. - * @param K the type of map keys. The map is invariant on its key type. - * @param V the type of map values. The mutable map is invariant on its value type. + * @param K the type of map keys. The map is invariant in its key type. + * @param V the type of map values. The mutable map is invariant in its value type. */ public interface MutableMap : Map { // Modification Operations diff --git a/runtime/src/main/kotlin/kotlin/collections/Set.kt b/runtime/src/main/kotlin/kotlin/collections/Set.kt index 9a9a0e7d18b..a7e1c76ad00 100644 --- a/runtime/src/main/kotlin/kotlin/collections/Set.kt +++ b/runtime/src/main/kotlin/kotlin/collections/Set.kt @@ -9,7 +9,7 @@ package kotlin.collections * A generic unordered collection of elements that does not support duplicate elements. * Methods in this interface support only read-only access to the set; * read/write access is supported through the [MutableSet] interface. - * @param E the type of elements contained in the set. The set is covariant on its element type. + * @param E the type of elements contained in the set. The set is covariant in its element type. */ public interface Set : Collection { // Query Operations @@ -26,7 +26,7 @@ public interface Set : Collection { /** * A generic unordered collection of elements that does not support duplicate elements, and supports * adding and removing elements. - * @param E the type of elements contained in the set. The mutable set is invariant on its element type. + * @param E the type of elements contained in the set. The mutable set is invariant in its element type. */ public interface MutableSet : Set, MutableCollection { // Query Operations