Drop io.vavr.control.Option.getOrNull which now exists as a member
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt
index f96e425..efeede0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.util.vavr
import io.vavr.Tuple2
-import io.vavr.control.Option
typealias ImmutableMap<K, V> = io.vavr.collection.Map<K, V>
typealias ImmutableHashMap<K, V> = io.vavr.collection.HashMap<K, V>
@@ -17,5 +16,4 @@
operator fun <T> Tuple2<T, *>.component1(): T = _1()
operator fun <T> Tuple2<*, T>.component2(): T = _2()
-fun <T> Option<T>.getOrNull(): T? = getOrElse(null as T?)
fun <K, V> ImmutableMap<K, V>.getOrNull(k: K): V? = get(k)?.getOrElse(null as V?)
diff --git a/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt
index 37bd8ea..3f823a3 100644
--- a/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt
+++ b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/util/vavr/vavrAdapters.kt
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.util.vavr
import io.vavr.Tuple2
-import io.vavr.control.Option
internal typealias ImmutableMap<K, V> = io.vavr.collection.Map<K, V>
internal typealias ImmutableHashMap<K, V> = io.vavr.collection.HashMap<K, V>
@@ -17,5 +16,4 @@
internal operator fun <T> Tuple2<T, *>.component1(): T = _1()
internal operator fun <T> Tuple2<*, T>.component2(): T = _2()
-internal fun <T> Option<T>.getOrNull(): T? = getOrElse(null as T?)
internal fun <K, V> ImmutableMap<K, V>.getOrNull(k: K): V? = get(k)?.getOrElse(null as V?)
