Rename toMap and toMapBy to associate and associateBy

libraries/tools/idl2k/src/main/kotlin/gen.kt

@@ -170,11 +170,11 @@ fun mapDefinitions(repository: Repository, definitions: Iterable<InterfaceDefini
         definitions.filter { "NoInterfaceObject" !in it.extendedAttributes.map { it.call } }.map { generateTrait(repository, it) }
 
 fun generateUnions(ifaces: List<GenerateTraitOrClass>, typedefs: Iterable<TypedefDefinition>): GenerateUnionTypes {
-    val declaredTypes = ifaces.toMapBy { it.name }
+    val declaredTypes = ifaces.associateBy { it.name }
 
     val anonymousUnionTypes = collectUnionTypes(declaredTypes)
     val anonymousUnionTypeTraits = generateUnionTypeTraits(anonymousUnionTypes)
-    val anonymousUnionsMap = anonymousUnionTypeTraits.toMapBy { it.name }
+    val anonymousUnionsMap = anonymousUnionTypeTraits.associateBy { it.name }
 
     val typedefsToBeGenerated = typedefs.filter { it.types is UnionType }
             .map { NamedValue(it.name, it.types as UnionType) }

libraries/tools/idl2k/src/main/kotlin/render.kt

@@ -227,7 +227,7 @@ private fun Pair<String, String>.betterName() = if (((0..9).map { it.toString()
 fun <K, V> List<Pair<K, V>>.toMultiMap(): Map<K, List<V>> = groupBy { it.first }.mapValues { it.value.map { it.second } }
 
 fun Appendable.render(namespace: String, ifaces: List<GenerateTraitOrClass>, unions : GenerateUnionTypes) {
-    val declaredTypes = ifaces.toMapBy { it.name }
+    val declaredTypes = ifaces.associateBy { it.name }
 
     val allTypes = declaredTypes + unions.anonymousUnionsMap + unions.typedefsMarkersMap
     declaredTypes.values.filter { it.namespace == namespace }.forEach {