Fix warnings in stdlib/compiler/plugins/test code

compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.codeMetaInfo.renderConfigurations
 
-import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory1
 import org.jetbrains.kotlin.codeMetaInfo.model.CodeMetaInfo
 import org.jetbrains.kotlin.codeMetaInfo.model.DiagnosticCodeMetaInfo
@@ -39,8 +38,7 @@ open class DiagnosticCodeMetaInfoRenderConfiguration(
             else -> DefaultErrorMessages.getRendererForDiagnostic(codeMetaInfo.diagnostic)
         }
         if (renderer is AbstractDiagnosticWithParametersRenderer) {
-            val renderParameters = renderer.renderParameters(codeMetaInfo.diagnostic)
-            params.addAll(ContainerUtil.map(renderParameters) { it.toString() })
+            renderer.renderParameters(codeMetaInfo.diagnostic).mapTo(params, Any::toString)
         }
         if (renderSeverity)
             params.add("severity='${codeMetaInfo.diagnostic.severity}'")

compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/Condition.kt

@@ -75,9 +75,7 @@ object Conditions {
     fun <T> not(c: Condition<T>): Condition<T> {
         if (c === alwaysTrue<Any>()) return alwaysFalse()
         if (c === alwaysFalse<Any>()) return alwaysTrue()
-        return if (c is Not<*>) {
-            (c as Not<T>).c as Condition<T>
-        } else Not(c)
+        return if (c is Not<*>) (c as Not<T>).c else Not(c)
     }
 
     fun <T> and(c1: Condition<T>, c2: Condition<T>): Condition<T> {