From fc4ff3b7605889f1a79598cdcd6ea5f75f6acc1d Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 15 Sep 2017 13:30:21 +0300
Subject: [PATCH] Migration to expect/actual: renames in DeclarationResolver

---
 .../src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt
index 94a93a3cb01..374b0b0450b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt
@@ -78,12 +78,12 @@ class DeclarationResolver(
         for ((fqName, declarationsOrPackageDirectives) in topLevelFqNames.asMap()) {
             if (fqName.isRoot) continue
 
-            // TODO: report error on header class and impl val, or vice versa
-            val (header, impl) =
+            // TODO: report error on expected class and actual val, or vice versa
+            val (expected, actual) =
                     getTopLevelDescriptorsByFqName(topLevelDescriptorProvider, fqName, NoLookupLocation.WHEN_CHECK_DECLARATION_CONFLICTS)
                     .partition { it is MemberDescriptor && it.isExpect }
 
-            for (descriptors in listOf(header, impl)) {
+            for (descriptors in listOf(expected, actual)) {
                 if (descriptors.size > 1) {
                     for (directive in declarationsOrPackageDirectives) {
                         val reportAt = (directive as? KtPackageDirective)?.nameIdentifier ?: directive