From adc45fd3dd81cf519ba3637e1f59ac38e3079f76 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 9 Jul 2021 10:17:55 +0300
Subject: [PATCH] [FIR] Remove useless generic parameter from deprecation utils

---
 .../checkers/expression/FirDeprecationChecker.kt     | 12 ++++++------
 .../kotlin/fir/declarations/deprecationUtils.kt      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt
index f5d5ace8b63..5d9fd7d70f6 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt
@@ -36,13 +36,13 @@ object FirDeprecationChecker : FirBasicExpressionChecker() {
         reportDeprecationIfNeeded(expression.source, referencedFir, expression, context, reporter)
     }
 
-    internal fun <T> reportDeprecationIfNeeded(
+    internal fun reportDeprecationIfNeeded(
         source: FirSourceElement?,
-        referencedFir: T,
+        referencedFir: FirAnnotatedDeclaration,
         callSite: FirElement?,
         context: CheckerContext,
         reporter: DiagnosticReporter
-    ) where T : FirAnnotatedDeclaration {
+    ) {
         val deprecation = getWorstDeprecation(callSite, referencedFir, context) ?: return
         val diagnostic = when (deprecation.level) {
             DeprecationLevelValue.ERROR, DeprecationLevelValue.HIDDEN -> FirErrors.DEPRECATION_ERROR
@@ -51,9 +51,9 @@ object FirDeprecationChecker : FirBasicExpressionChecker() {
         reporter.reportOn(source, diagnostic, referencedFir.symbol, deprecation.message ?: "", context)
     }
 
-    private fun <T : FirAnnotatedDeclaration> getWorstDeprecation(
+    private fun getWorstDeprecation(
         callSite: FirElement?,
-        fir: T,
+        fir: FirAnnotatedDeclaration,
         context: CheckerContext
     ): Deprecation? {
         val deprecationInfos = listOfNotNull(
@@ -65,4 +65,4 @@ object FirDeprecationChecker : FirBasicExpressionChecker() {
         return deprecationInfos.maxOrNull()
     }
 
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt
index b59b8a6c599..f3528372cf9 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt
@@ -26,7 +26,7 @@ private val LEVEL_NAME = Name.identifier("level")
 
 private val JAVA_ORIGINS = setOf(FirDeclarationOrigin.Java, FirDeclarationOrigin.Enhancement)
 
-fun <T : FirAnnotatedDeclaration> T.getDeprecation(callSite: FirElement?): Deprecation? {
+fun FirAnnotatedDeclaration.getDeprecation(callSite: FirElement?): Deprecation? {
     val deprecationInfos = mutableListOf<Deprecation>()
     when (this) {
         is FirProperty ->
@@ -75,7 +75,7 @@ fun List<FirAnnotationCall>.getDeprecationInfosFromAnnotations(currentVersion: A
     return DeprecationsPerUseSite.fromMap(deprecationByUseSite)
 }
 
-private fun <T : FirAnnotatedDeclaration> T.getDeprecationForCallSite(
+private fun FirAnnotatedDeclaration.getDeprecationForCallSite(
     vararg sites: AnnotationUseSiteTarget
 ): Deprecation? {
     val deprecations = when (this) {