From 9c1c506b21f3d03737f5b77189fceb09255ca302 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Fri, 9 Apr 2021 10:38:15 +0200
Subject: [PATCH] [Minor] Move ClassesToProcess into .tree.deserializer package

---
 .../org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt | 2 +-
 .../commonizer/tree/deserializer/CirTreeClassDeserializer.kt    | 1 -
 .../commonizer/tree/deserializer/CirTreePackageDeserializer.kt  | 1 -
 .../mergers => tree/deserializer}/ClassesToProcess.kt           | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename native/commonizer/src/org/jetbrains/kotlin/commonizer/{mergedtree/mergers => tree/deserializer}/ClassesToProcess.kt (98%)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt
index 591fc0133e1..a2b37bfb257 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt
@@ -10,7 +10,7 @@ import kotlinx.metadata.KmTypeParameter
 import org.jetbrains.kotlin.commonizer.cir.CirEntityId
 import org.jetbrains.kotlin.commonizer.mergedtree.CirProvided
 import org.jetbrains.kotlin.commonizer.mergedtree.CirProvidedClassifiers
-import org.jetbrains.kotlin.commonizer.mergedtree.mergers.ClassesToProcess
+import org.jetbrains.kotlin.commonizer.tree.deserializer.ClassesToProcess
 
 typealias TypeParameterId = Int
 typealias TypeParameterIndex = Int
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeClassDeserializer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeClassDeserializer.kt
index 68597f17729..b167a1e921e 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeClassDeserializer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeClassDeserializer.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.commonizer.tree.deserializer
 
 import kotlinx.metadata.Flag
 import kotlinx.metadata.KmClass
-import org.jetbrains.kotlin.commonizer.mergedtree.mergers.ClassesToProcess
 import org.jetbrains.kotlin.commonizer.metadata.CirDeserializers
 import org.jetbrains.kotlin.commonizer.metadata.CirTypeResolver
 import org.jetbrains.kotlin.commonizer.tree.CirTreeClass
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreePackageDeserializer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreePackageDeserializer.kt
index 2ef64148a51..254bc22611c 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreePackageDeserializer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreePackageDeserializer.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.commonizer.tree.deserializer
 import kotlinx.metadata.KmModuleFragment
 import org.jetbrains.kotlin.commonizer.cir.CirPackage
 import org.jetbrains.kotlin.commonizer.cir.CirPackageName
-import org.jetbrains.kotlin.commonizer.mergedtree.mergers.ClassesToProcess
 import org.jetbrains.kotlin.commonizer.metadata.CirTypeResolver
 import org.jetbrains.kotlin.commonizer.tree.CirTreePackage
 
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/ClassesToProcess.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/ClassesToProcess.kt
similarity index 98%
rename from native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/ClassesToProcess.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/ClassesToProcess.kt
index 86b0b544d14..e9c9f57baeb 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/ClassesToProcess.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/ClassesToProcess.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.commonizer.mergedtree.mergers
+package org.jetbrains.kotlin.commonizer.tree.deserializer
 
 import com.intellij.util.containers.FactoryMap
 import kotlinx.metadata.Flag