Cleanup RC deprecations in compiler and plugin.
This commit is contained in:
+1
-1
@@ -49,7 +49,7 @@ class AnnotationDeserializer(private val module: ModuleDescriptor) {
|
||||
if (proto.argumentCount != 0 && !ErrorUtils.isError(annotationClass) && DescriptorUtils.isAnnotationClass(annotationClass)) {
|
||||
val constructor = annotationClass.constructors.singleOrNull()
|
||||
if (constructor != null) {
|
||||
val parameterByName = constructor.valueParameters.toMapBy { it.name }
|
||||
val parameterByName = constructor.valueParameters.associateBy { it.name }
|
||||
arguments = proto.argumentList.map { resolveArgument(it, parameterByName, nameResolver) }.filterNotNull().toMap()
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -287,7 +287,7 @@ class DeserializedClassDescriptor(
|
||||
}
|
||||
|
||||
private inner class EnumEntryClassDescriptors {
|
||||
private val enumEntryProtos = classProto.enumEntryList.toMapBy { c.nameResolver.getName(it.name) }
|
||||
private val enumEntryProtos = classProto.enumEntryList.associateBy { c.nameResolver.getName(it.name) }
|
||||
private val protoContainer =
|
||||
ProtoContainer.Class(classProto, c.nameResolver, c.typeTable, (containingDeclaration as? ClassDescriptor)?.kind)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user