Code cleanup: several inspections applied

2017-06-27 14:26:19 +03:00
parent fdca96634e
commit 840847e47c
76 changed files with 121 additions and 147 deletions
@@ -147,12 +147,11 @@ class OverloadingConflictResolver<C : Any>(
                candidates.firstOrNull()
            else when (checkArgumentsMode) {
                CheckArgumentTypesMode.CHECK_CALLABLE_TYPE ->
-                    uniquifyCandidatesSet(candidates).filter {
-                        isDefinitelyMostSpecific(it, candidates) {
-                            call1, call2 ->
+                    uniquifyCandidatesSet(candidates).singleOrNull {
+                        isDefinitelyMostSpecific(it, candidates) { call1, call2 ->
                            isNotLessSpecificCallableReference(call1.resultingDescriptor, call2.resultingDescriptor)
                        }
-                    }.singleOrNull()
+                    }

                CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS ->
                    findMaximallySpecificCall(candidates, discriminateGenerics, isDebuggerContext)