From bf21e1282a5e20007ce6833d5ef36db17f7776b6 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 13 May 2020 12:23:38 +0300 Subject: [PATCH] Suppress most of unused parameter warnings --- libraries/stdlib/js-ir/build.gradle.kts | 3 ++- libraries/stdlib/js-ir/builtins/Arrays.kt | 5 +++-- libraries/stdlib/js-ir/builtins/Primitives.kt | 2 +- libraries/stdlib/src/kotlin/collections/MapAccessors.kt | 3 ++- libraries/stdlib/src/kotlin/time/TimeSource.kt | 2 ++ libraries/stdlib/test/collections/ArrayDequeTest.kt | 8 ++++---- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index c7ef3936c7e..6ab506b3b6e 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -21,7 +21,8 @@ val builtInsHeader = """@file:Suppress( "MUST_BE_INITIALIZED_OR_BE_ABSTRACT", "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE", "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED", - "WRONG_MODIFIER_TARGET" + "WRONG_MODIFIER_TARGET", + "UNUSED_PARAMETER" ) """ diff --git a/libraries/stdlib/js-ir/builtins/Arrays.kt b/libraries/stdlib/js-ir/builtins/Arrays.kt index 6b7c431f812..d4ee49bc987 100644 --- a/libraries/stdlib/js-ir/builtins/Arrays.kt +++ b/libraries/stdlib/js-ir/builtins/Arrays.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -8,7 +8,8 @@ "MUST_BE_INITIALIZED_OR_BE_ABSTRACT", "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE", "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED", - "WRONG_MODIFIER_TARGET" + "WRONG_MODIFIER_TARGET", + "UNUSED_PARAMETER" ) package kotlin diff --git a/libraries/stdlib/js-ir/builtins/Primitives.kt b/libraries/stdlib/js-ir/builtins/Primitives.kt index 6a9ae8b7642..bc3a29500e5 100644 --- a/libraries/stdlib/js-ir/builtins/Primitives.kt +++ b/libraries/stdlib/js-ir/builtins/Primitives.kt @@ -4,7 +4,7 @@ */ // Auto-generated file. DO NOT EDIT! -@file:Suppress("NON_ABSTRACT_FUNCTION_WITH_NO_BODY") +@file:Suppress("NON_ABSTRACT_FUNCTION_WITH_NO_BODY", "UNUSED_PARAMETER") package kotlin diff --git a/libraries/stdlib/src/kotlin/collections/MapAccessors.kt b/libraries/stdlib/src/kotlin/collections/MapAccessors.kt index 317d532ba4c..cecf88cd94a 100644 --- a/libraries/stdlib/src/kotlin/collections/MapAccessors.kt +++ b/libraries/stdlib/src/kotlin/collections/MapAccessors.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -35,6 +35,7 @@ public inline operator fun Map.getValue(thisRef public inline operator fun MutableMap.getValue(thisRef: Any?, property: KProperty<*>): V1 = @Suppress("UNCHECKED_CAST") (getOrImplicitDefault(property.name) as V1) +@Suppress("UNUSED_PARAMETER") @Deprecated("Use getValue() with two type parameters instead", level = DeprecationLevel.ERROR) @kotlin.jvm.JvmName("getVarContravariant") @kotlin.internal.LowPriorityInOverloadResolution diff --git a/libraries/stdlib/src/kotlin/time/TimeSource.kt b/libraries/stdlib/src/kotlin/time/TimeSource.kt index 5ffbe1c8385..061f7b5f612 100644 --- a/libraries/stdlib/src/kotlin/time/TimeSource.kt +++ b/libraries/stdlib/src/kotlin/time/TimeSource.kt @@ -94,6 +94,7 @@ public abstract class TimeMark { "Subtracting one TimeMark from another is not a well defined operation because these time marks could have been obtained from the different time sources.", level = DeprecationLevel.ERROR ) +@Suppress("UNUSED_PARAMETER") public inline operator fun TimeMark.minus(other: TimeMark): Duration = throw Error("Operation is disallowed.") @ExperimentalTime @@ -103,6 +104,7 @@ public inline operator fun TimeMark.minus(other: TimeMark): Duration = throw Err "Comparing one TimeMark to another is not a well defined operation because these time marks could have been obtained from the different time sources.", level = DeprecationLevel.ERROR ) +@Suppress("UNUSED_PARAMETER") public inline operator fun TimeMark.compareTo(other: TimeMark): Int = throw Error("Operation is disallowed.") diff --git a/libraries/stdlib/test/collections/ArrayDequeTest.kt b/libraries/stdlib/test/collections/ArrayDequeTest.kt index 31344701352..8e7053966c6 100644 --- a/libraries/stdlib/test/collections/ArrayDequeTest.kt +++ b/libraries/stdlib/test/collections/ArrayDequeTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -89,7 +89,7 @@ class ArrayDequeTest { } @Test - fun clear() = testArrayDeque { bufferSize: Int, dequeSize: Int, head: Int, tail: Int -> + fun clear() = testArrayDeque { bufferSize: Int, _: Int, head: Int, tail: Int -> val deque = generateArrayDeque(head, tail, bufferSize).apply { clear() } assertTrue(deque.isEmpty()) } @@ -543,7 +543,7 @@ class ArrayDequeTest { } @Test - fun removeAll() = testArrayDeque { bufferSize: Int, dequeSize: Int, head: Int, tail: Int -> + fun removeAll() = testArrayDeque { bufferSize: Int, _: Int, head: Int, tail: Int -> generateArrayDeque(head, tail, bufferSize).let { deque -> deque.removeAll(emptyList()) assertEquals((head until tail).toList(), deque) @@ -565,7 +565,7 @@ class ArrayDequeTest { } @Test - fun retainAll() = testArrayDeque { bufferSize: Int, dequeSize: Int, head: Int, tail: Int -> + fun retainAll() = testArrayDeque { bufferSize: Int, _: Int, head: Int, tail: Int -> val listToRetain = (head..tail).filter { Random.nextBoolean() } val elements = (head until tail).toMutableList().apply { retainAll(listToRetain) }