From c2968b6a687a2611e6f39cce90859f5188aedaae Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 7 Feb 2019 16:51:20 +0100 Subject: [PATCH] Minor, use kotlin.Pair in JvmSerializationBindings.FIELD_FOR_PROPERTY --- .../src/org/jetbrains/kotlin/codegen/PropertyCodegen.java | 4 ++-- .../codegen/serialization/JvmSerializationBindings.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 9cd43a4cda9..d6c285ac0dd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.codegen; -import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; +import kotlin.Pair; import kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -423,7 +423,7 @@ public class PropertyCodegen { String name = backingFieldContext.getFieldName(propertyDescriptor, isDelegate); - v.getSerializationBindings().put(FIELD_FOR_PROPERTY, propertyDescriptor, Pair.create(type, name)); + v.getSerializationBindings().put(FIELD_FOR_PROPERTY, propertyDescriptor, new Pair<>(type, name)); if (isBackingFieldOwner) { FieldVisitor fv = builder.newField( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializationBindings.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializationBindings.java index 459964efac7..1e835eda51f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializationBindings.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializationBindings.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen.serialization; -import com.intellij.openapi.util.Pair; +import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor;