azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename KotlinBuiltInsNames to StandardNames

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-19 12:32:07 +03:00
parent d032fdfc44
commit a764732020
184 changed files with 643 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.metadata.deserialization.TypeTable
import org.jetbrains.kotlin.metadata.deserialization.VersionRequirementTable
@@ -83,7 +83,7 @@ class ClassDeserializer(private val components: DeserializationComponents) {
* but the metadata is still serialized for kotlin-reflect 1.0 to work (see BuiltInsSerializer.kt).
*/
val BLACK_LIST = setOf(
ClassId.topLevel(KotlinBuiltInsNames.FqNames.cloneable.toSafe())
ClassId.topLevel(StandardNames.FqNames.cloneable.toSafe())
)
}
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInsLoaderImpl.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.serialization.deserialization.builtins
import org.jetbrains.kotlin.builtins.BuiltInsLoader
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.NotFoundClasses
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
@@ -35,7 +35,7 @@ class BuiltInsLoaderImpl : BuiltInsLoader {
return createBuiltInPackageFragmentProvider(
storageManager,
builtInsModule,
KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAMES,
StandardNames.BUILT_INS_PACKAGE_FQ_NAMES,
classDescriptorFactories,
platformDependentDeclarationFilter,
additionalClassPartsProvider,