From 8e3bdd6a0f1232af4dd3962b491393062bcb9dd8 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 25 Jan 2016 13:46:25 +0300
Subject: [PATCH] Minor. Rename parameter and get rid of labels

---
 .../src/org/jetbrains/kotlin/types/TypeSubstitution.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
index 88f2ddddd5e..d8c0d699e6d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
@@ -119,13 +119,13 @@ fun KotlinType.computeNewSubstitution(
 
 fun KotlinType.replace(
         newArguments: List<TypeProjection>,
-        annotations: Annotations = this@replace.annotations
+        newAnnotations: Annotations = annotations
 ): KotlinType {
-    if (newArguments.isEmpty() && annotations === this.annotations) return this
+    if (newArguments.isEmpty() && newAnnotations === annotations) return this
 
     if (newArguments.isEmpty()) {
         return KotlinTypeImpl.create(
-                annotations,
+                newAnnotations,
                 constructor,
                 isMarkedNullable,
                 arguments,
@@ -144,7 +144,7 @@ fun KotlinType.replace(
             else ErrorUtils.createErrorScope("Unexpected declaration descriptor for type constructor: $constructor")
 
     return KotlinTypeImpl.create(
-            annotations,
+            newAnnotations,
             constructor,
             isMarkedNullable,
             newArguments,