From a0baecc6e4e843166045dc1b5accba8764433d19 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Thu, 4 Mar 2021 02:30:58 +0300
Subject: [PATCH] [Commonizer] Rename: CirTreeMergerV2 -> CirTreeMerger

---
 .../src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt | 4 ++--
 .../mergedtree/{CirTreeMergerV2.kt => CirTreeMerger.kt}       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/{CirTreeMergerV2.kt => CirTreeMerger.kt} (99%)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt
index 016f788072b..ad68773eeda 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.ResultsConsumer.Status
 import org.jetbrains.kotlin.descriptors.commonizer.core.CommonizationVisitor
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.*
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirNode.Companion.dimension
-import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirTreeMergerV2.CirTreeMergeResult
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirTreeMerger.CirTreeMergeResult
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.MetadataBuilder
 import org.jetbrains.kotlin.library.SerializedMetadata
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -46,7 +46,7 @@ private fun mergeAndCommonize(storageManager: StorageManager, parameters: Common
             CirProvidedClassifiers.by(parameters.dependencyModulesProvider)
         )
     )
-    val mergeResult = CirTreeMergerV2(storageManager, classifiers, parameters).build()
+    val mergeResult = CirTreeMerger(storageManager, classifiers, parameters).build()
 
     // commonize:
     val mergedTree = mergeResult.root
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMergerV2.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
similarity index 99%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMergerV2.kt
rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
index 4c97473094a..210d6c2b9b9 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMergerV2.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
@@ -49,7 +49,7 @@ import org.jetbrains.kotlin.storage.StorageManager
  * targets (which is not supported yet), or a Native library where one fragment is produced via C-interop tool and the other one
  * is compiled from Kotlin/Native source code (not sure this should be supported at all).
  */
-class CirTreeMergerV2(
+class CirTreeMerger(
     private val storageManager: StorageManager,
     private val classifiers: CirKnownClassifiers,
     private val parameters: CommonizerParameters