Drop min functions from addToStdlib.kt

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictingProjectionChecker.kt

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.utils.addToStdlib.min
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object FirConflictingProjectionChecker : FirBasicDeclarationChecker() {
@@ -48,7 +47,7 @@ object FirConflictingProjectionChecker : FirBasicDeclarationChecker() {
             ?.fir.safeAs<FirRegularClass>()
             ?: return
 
-        val size = min(declaration.typeParameters.size, typeRef.coneType.typeArguments.size)
+        val size = minOf(declaration.typeParameters.size, typeRef.coneType.typeArguments.size)
 
         for (it in 0 until size) {
             val proto = declaration.typeParameters[it]

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt

@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.types.AbstractTypeChecker
 import org.jetbrains.kotlin.types.AbstractTypeCheckerContext
-import org.jetbrains.kotlin.utils.addToStdlib.min
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object FirOverrideChecker : FirClassChecker() {
@@ -69,7 +68,7 @@ object FirOverrideChecker : FirClassChecker() {
             ?: return this
 
         val map = mutableMapOf<FirTypeParameterSymbol, ConeKotlinType>()
-        val size = min(overrideDeclaration.typeParameters.size, parametersOwner.typeParameters.size)
+        val size = minOf(overrideDeclaration.typeParameters.size, parametersOwner.typeParameters.size)
 
         for (it in 0 until size) {
             val to = overrideDeclaration.typeParameters[it]

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUpperBoundViolatedChecker.kt

@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.types.AbstractTypeChecker
-import org.jetbrains.kotlin.utils.addToStdlib.min
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object FirUpperBoundViolatedChecker : FirQualifiedAccessChecker() {
@@ -36,7 +35,7 @@ object FirUpperBoundViolatedChecker : FirQualifiedAccessChecker() {
             ?.fir.safeAs<FirTypeParameterRefsOwner>()
             ?: return
 
-        val count = min(calleeFir.typeParameters.size, expression.typeArguments.size)
+        val count = minOf(calleeFir.typeParameters.size, expression.typeArguments.size)
 
         if (count == 0) {
             return
@@ -125,7 +124,7 @@ object FirUpperBoundViolatedChecker : FirQualifiedAccessChecker() {
             ?.safeAs<ConeClassLikeType>()
             ?: return
 
-        val count = min(protoConstructor.typeParameters.size, actualConstructor.typeArguments.size)
+        val count = minOf(protoConstructor.typeParameters.size, actualConstructor.typeArguments.size)
 
         if (count == 0) {
             return
@@ -191,7 +190,7 @@ object FirUpperBoundViolatedChecker : FirQualifiedAccessChecker() {
             ?.fir.safeAs<FirRegularClass>()
             ?: return false
 
-        val count = min(prototypeClass.typeParameters.size, type.typeArguments.size)
+        val count = minOf(prototypeClass.typeParameters.size, type.typeArguments.size)
 
         if (count == 0) {
             return false

core/util.runtime/src/org/jetbrains/kotlin/utils/addToStdlib.kt

@@ -144,9 +144,6 @@ inline fun <T, R, C : MutableCollection<in R>> Iterable<T>.flatMapToNullable(des
     return destination
 }
 
-fun <E : Enum<E>> min(a: E, b: E): E = if (a < b) a else b
-fun <E : Comparable<E>> min(a: E, b: E): E = if (a < b) a else b
-
 inline fun <T, R> Iterable<T>.same(extractor: (T) -> R): Boolean {
     val iterator = iterator()
     val firstValue = extractor(iterator.next())

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt

@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.scripting.compiler.plugin.repl.*
 import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
 import org.jetbrains.kotlin.scripting.resolve.skipExtensionsResolutionForImplicits
 import org.jetbrains.kotlin.scripting.resolve.skipExtensionsResolutionForImplicitsExceptInnermost
-import org.jetbrains.kotlin.utils.addToStdlib.min
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -301,7 +300,7 @@ open class KJvmReplCompilerBase<AnalyzerT : ReplCodeAnalyzerBase> protected cons
                 .map { KotlinType(it.get().scriptClassFQName) }
                 .toList()
 
-        val skipFirstTime = allPreviousLines.subList(0, min(1, allPreviousLines.size))
+        val skipFirstTime = allPreviousLines.subList(0, minOf(1, allPreviousLines.size))
         val skipAlways =
             if (allPreviousLines.isEmpty()) emptyList()
             else allPreviousLines.subList(1, allPreviousLines.size)