Drop inlineOptions and fix forgotten usages

compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.kt

@@ -11,4 +11,4 @@ val a: Enum<E> = E.ENTRY
 val b: Enum<RetentionPolicy> = RetentionPolicy.RUNTIME
 
 // Test deserialized resolve
-val c: Enum<InlineOption> = InlineOption.ONLY_LOCAL_RETURN
+val c: Enum<AnnotationTarget> = AnnotationTarget.CLASS

compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt

@@ -2,7 +2,7 @@ package
 
 public val a: kotlin.Enum<E>
 public val b: kotlin.Enum<java.lang.annotation.RetentionPolicy>
-public val c: kotlin.Enum<kotlin.InlineOption>
+public val c: kotlin.Enum<kotlin.annotation.AnnotationTarget>
 
 public final enum class E : kotlin.Enum<E> {
     enum entry ENTRY

compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
     val s = object {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
     val s = object {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.kt

@@ -1,4 +1,3 @@
-import kotlin.InlineOption.*
 
 inline fun <R> onlyLocal(crossinline p: () -> R) {
     inlineAll(p)

compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.kt

@@ -1,4 +1,3 @@
-import kotlin.InlineOption.*
 
 inline fun <R> inlineFunWithAnnotation(crossinline p: () -> R) {
     inlineFun {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.kt

@@ -1,4 +1,3 @@
-import kotlin.InlineOption.ONLY_LOCAL_RETURN
 
 inline fun testSameCaptured(lambdaWithResultCaptured: () -> Unit) : String {
     doWork({<!NON_LOCAL_RETURN_NOT_ALLOWED!>lambdaWithResultCaptured<!>()})

compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
     <!NOT_YET_SUPPORTED_IN_INLINE!>fun a() {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
     {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
     <!NOT_YET_SUPPORTED_IN_INLINE!>class A {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 fun <R> fun1(p: () -> R) {
     inlineFun {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
-import kotlin.InlineOption.*
 
 class Z {
     inline fun <R> inlineFun(crossinline p: () -> R) {

compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.kt

@@ -1,4 +1,3 @@
-import kotlin.InlineOption.*
 
 inline fun <R> toOnlyLocal(crossinline p: () -> R) {
     p()