Cleanup in core modules

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/BinaryVersion.kt

@@ -50,7 +50,7 @@ data class BinaryVersion private constructor(
                     major = version.getOrNull(0) ?: UNKNOWN,
                     minor = version.getOrNull(1) ?: UNKNOWN,
                     patch = version.getOrNull(2) ?: UNKNOWN,
-                    rest = if (version.size() > 3) version.asList().subList(3, version.size()).toList() else listOf()
+                    rest = if (version.size > 3) version.asList().subList(3, version.size).toList() else listOf()
             )
         }
 

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt

@@ -48,7 +48,7 @@ public class ClassDeserializer(private val components: DeserializationComponents
         }
         else {
             val fragments = components.packageFragmentProvider.getPackageFragments(classId.packageFqName)
-            assert(fragments.size() == 1) { "There should be exactly one package: $fragments, class id is $classId" }
+            assert(fragments.size == 1) { "There should be exactly one package: $fragments, class id is $classId" }
 
             val fragment = fragments.single()
             if (fragment is DeserializedPackageFragment) {

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt

@@ -50,7 +50,7 @@ public class TypeDeserializer(
     }
 
     val ownTypeParameters: List<TypeParameterDescriptor>
-            get() = typeParameterDescriptors().values().toReadOnlyList()
+            get() = typeParameterDescriptors().values.toReadOnlyList()
 
     // TODO: don't load identical types from TypeTable more than once
     fun type(proto: ProtoBuf.Type, additionalAnnotations: Annotations = Annotations.EMPTY): KotlinType {

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -280,7 +280,7 @@ public class DeserializedClassDescriptor(
         }
 
         fun all(): Collection<ClassDescriptor> {
-            val result = ArrayList<ClassDescriptor>(nestedClassNames.size())
+            val result = ArrayList<ClassDescriptor>(nestedClassNames.size)
             nestedClassNames.forEach { name -> result.addIfNotNull(findNestedClass(name)) }
             return result
         }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt

@@ -143,12 +143,12 @@ public abstract class DeserializedMemberScope protected constructor(
             location: LookupLocation
     ) {
         if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
-            val keys = propertyProtos().keySet().filter { nameFilter(it.name) }
+            val keys = propertyProtos().keys.filter { nameFilter(it.name) }
             addMembers(result, keys) { getContributedVariables(it, location) }
         }
 
         if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
-            val keys = functionProtos().keySet().filter { nameFilter(it.name) }
+            val keys = functionProtos().keys.filter { nameFilter(it.name) }
             addMembers(result, keys) { getContributedFunctions(it, location) }
         }
     }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt

@@ -26,7 +26,7 @@ public fun ModuleDescriptor.findClassAcrossModuleDependencies(classId: ClassId):
     val segments = classId.relativeClassName.pathSegments()
     val topLevelClass = packageViewDescriptor.memberScope.getContributedClassifier(segments.first(), NoLookupLocation.FROM_DESERIALIZATION) as? ClassDescriptor ?: return null
     var result = topLevelClass
-    for (name in segments.subList(1, segments.size())) {
+    for (name in segments.subList(1, segments.size)) {
         result = result.unsubstitutedInnerClassesScope.getContributedClassifier(name, NoLookupLocation.FROM_DESERIALIZATION) as? ClassDescriptor ?: return null
     }
     return result