Get rid of deprecated annotations and modifiers in project code

This commit is contained in:
Denis Zharkov
2015-09-14 16:26:59 +03:00
parent 02aafe4262
commit 9c4564a5a6
204 changed files with 485 additions and 439 deletions
@@ -48,12 +48,12 @@ fun generate(): String {
val binaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
val builtIns = KotlinBuiltIns.getInstance()
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getDescriptors()
.filter { it is ClassDescriptor && KotlinBuiltIns.isPrimitiveType(it.getDefaultType()) } as List<ClassDescriptor>
for (descriptor in allPrimitiveTypes + builtIns.getString()) {
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
val functions = descriptor.getMemberScope(listOf()).getDescriptors()
.filter { it is FunctionDescriptor && !EXCLUDED_FUNCTIONS.contains(it.getName().asString()) } as List<FunctionDescriptor>
@@ -24,13 +24,12 @@ import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
import org.jetbrains.kotlin.utils.Printer
import java.io.File
import java.util.*
import kotlin.platform.platformStatic
class GenerateProtoBufCompare {
companion object {
val DEST_FILE: File = File("jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt")
platformStatic
@JvmStatic
fun main(args: Array<String>) {
generate(DEST_FILE)
}
@@ -953,7 +953,7 @@ fun main(args: Array<String>) {
private class TestGroup(val testsRoot: String, val testDataRoot: String) {
inline fun <reified T: TestCase> testClass(
suiteTestClass: String = getDefaultSuiteTestClass(javaClass<T>()),
@noinline init: TestClass.() -> Unit
noinline init: TestClass.() -> Unit
) {
testClass(javaClass<T>(), suiteTestClass, init)
}
@@ -26,7 +26,7 @@ import java.lang.reflect.Modifier
public class ProtoBufConsistencyTest : TestCase() {
public fun testExtensionNumbersDoNotIntersect() {
@data class Key(val messageType: Class<*>, val index: Int)
data class Key(val messageType: Class<*>, val index: Int)
val extensions = LinkedHashMultimap.create<Key, Descriptors.FieldDescriptor>()