Update tests after rebase

compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt

@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
@@ -15,10 +14,10 @@ fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TOD
 
 class A
 
-val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
     yield(<!NO_COMPANION_OBJECT!>A<!>)
 }
 
-val test2: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>generate {
-    yield(<!TYPE_MISMATCH{NI}!>A()<!>)
+val test2: Int = <!TYPE_MISMATCH!>generate {
+    yield(<!TYPE_MISMATCH!>A()<!>)
 }<!>

compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 suspend fun <V> await(f: V): V = f
 
@@ -8,10 +7,10 @@ fun <T> genericBuilder(c: suspend () -> T): T = null!!
 fun foo() {
     var result = ""
     genericBuilder<String> {
-        <!TYPE_MISMATCH{NI}!>try {
+        <!TYPE_MISMATCH!>try {
             await("")
         } catch(e: Exception) {
-            <!EXPECTED_TYPE_MISMATCH{OI}!>result = "fail"<!>
+            result = "fail"
         }<!>
     }
 }