Switch kotlin version to 1.8

with appropriate fixes in testdata, tests and other
places.
This commit is contained in:
Ilya Chernikov
2022-06-09 17:07:50 +02:00
parent 7fa459044f
commit bb996c1b27
179 changed files with 1038 additions and 978 deletions
@@ -3,11 +3,11 @@ import java.util.*
fun use() {
Optional.empty<String>()
// SUCCESS
// ORIGINAL: fun <T : Any!> empty(): Optional<T> defined in java.util.Optional
// ORIGINAL: fun <T : Any!> empty(): Optional<T & Any> defined in java.util.Optional
// SUBSTITUTED: fun <T : Any!> empty(): Optional<String> defined in java.util.Optional
Optional.empty<String?>()
// SUCCESS
// ORIGINAL: fun <T : Any!> empty(): Optional<T> defined in java.util.Optional
// ORIGINAL: fun <T : Any!> empty(): Optional<T & Any> defined in java.util.Optional
// SUBSTITUTED: fun <T : Any!> empty(): Optional<String> defined in java.util.Optional
}
@@ -3,14 +3,14 @@ import java.util.*
fun use(v: Optional<String>) {
v.get()
// SUCCESS
// ORIGINAL: fun get(): T defined in java.util.Optional
// ORIGINAL: fun get(): T & Any defined in java.util.Optional
// SUBSTITUTED: fun get(): String defined in java.util.Optional
}
fun use2(v: Optional<String?>) {
v.get()
// SUCCESS
// ORIGINAL: fun get(): T defined in java.util.Optional
// ORIGINAL: fun get(): T & Any defined in java.util.Optional
// SUBSTITUTED: fun get(): String defined in java.util.Optional
}
@@ -3,14 +3,14 @@ import java.util.*
fun use(v: Optional<String>) {
v.ifPresent { value -> }
// SUCCESS
// ORIGINAL: fun ifPresent(Consumer<in T>): Unit defined in java.util.Optional
// ORIGINAL: fun ifPresent(Consumer<in T & Any>): Unit defined in java.util.Optional
// SUBSTITUTED: fun ifPresent(Consumer<in String>): Unit defined in java.util.Optional
}
fun use2(v: Optional<String?>) {
v.ifPresent { value -> }
// SUCCESS
// ORIGINAL: fun ifPresent(Consumer<in T>): Unit defined in java.util.Optional
// ORIGINAL: fun ifPresent(Consumer<in T & Any>): Unit defined in java.util.Optional
// SUBSTITUTED: fun ifPresent(Consumer<in String>): Unit defined in java.util.Optional
}
@@ -3,17 +3,17 @@ import java.util.*
fun use() {
val x: String? = "x"
Optional.of(x)
// UNSAFE_CALL_ERROR
// ORIGINAL: fun <T : Any!> of(T): Optional<T> defined in java.util.Optional
// SUCCESS
// ORIGINAL: fun <T : Any!> of(T & Any): Optional<T & Any> defined in java.util.Optional
// SUBSTITUTED: fun <T : Any!> of(String): Optional<String> defined in java.util.Optional
Optional.of(x!!)
// SUCCESS
// ORIGINAL: fun <T : Any!> of(T): Optional<T> defined in java.util.Optional
// ORIGINAL: fun <T : Any!> of(T & Any): Optional<T & Any> defined in java.util.Optional
// SUBSTITUTED: fun <T : Any!> of(String): Optional<String> defined in java.util.Optional
Optional.ofNullable(x)
// SUCCESS
// ORIGINAL: fun <T : Any!> ofNullable(T?): Optional<T> defined in java.util.Optional
// ORIGINAL: fun <T : Any!> ofNullable(T?): Optional<T & Any> defined in java.util.Optional
// SUBSTITUTED: fun <T : Any!> ofNullable(String?): Optional<String> defined in java.util.Optional
}