Got rid of delegation in library impl hierarchy

89jd · Jun 13, 2019 · da11ab8 · da11ab8
1 parent b49b0be
commit da11ab8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt
@@ -47,15 +47,15 @@ private class FromZipBitcodeLibraryImpl(zipped: BitcodeLibraryLayoutImpl, zipFil
     FromZipTargetedLibraryImpl(zipped, zipFileSystem), BitcodeKotlinLibraryLayout
 
 open class ExtractingTargetedLibraryImpl(zipped: TargetedLibraryLayoutImpl) :
-    KotlinLibraryExtractor(zipped),
-    TargetedKotlinLibraryLayout by zipped {
+    ExtractingKotlinLibraryLayout(zipped),
+    TargetedKotlinLibraryLayout {
 
-    override val includedDir: File by lazy { extractDir(zipped.includedDir) }
+    override val includedDir: File by lazy { zipped.extractDir(zipped.includedDir) }
 }
 
 class ExtractingBitcodeLibraryImpl(zipped: BitcodeLibraryLayoutImpl) :
     ExtractingTargetedLibraryImpl(zipped), BitcodeKotlinLibraryLayout {
 
-    override val kotlinDir: File by lazy { extractDir(zipped.kotlinDir) }
-    override val nativeDir: File by lazy { extractDir(zipped.nativeDir) }
+    override val kotlinDir: File by lazy { zipped.extractDir(zipped.kotlinDir) }
+    override val nativeDir: File by lazy { zipped.extractDir(zipped.nativeDir) }
 }