From f025a3b8c45da986fd6198020dd89ffca2e2c817 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 12 Feb 2016 23:18:47 +0300
Subject: [PATCH] Cleanup: rename parameters to match overriden method (in
 private implementations). Remove some redundancy.

---
 js/js.libraries/src/core/regex.kt                         | 4 ++--
 libraries/stdlib/src/kotlin/collections/MapWithDefault.kt | 2 +-
 libraries/stdlib/src/kotlin/io/files/Utils.kt             | 1 -
 libraries/stdlib/src/kotlin/text/Indent.kt                | 2 +-
 libraries/stdlib/src/kotlin/text/regex/Regex.kt           | 4 ++--
 libraries/stdlib/src/kotlin/util/Lazy.kt                  | 4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/js/js.libraries/src/core/regex.kt b/js/js.libraries/src/core/regex.kt
index dd2946c6c3b..ff0b44af28c 100644
--- a/js/js.libraries/src/core/regex.kt
+++ b/js/js.libraries/src/core/regex.kt
@@ -201,8 +201,8 @@ private fun RegExp.findNext(input: String, from: Int): MatchResult? {
             override val size: Int get() = match.size
             override fun isEmpty(): Boolean = size == 0
 
-            override fun contains(o: MatchGroup?): Boolean = this.any { it == o }
-            override fun containsAll(c: Collection<MatchGroup?>): Boolean = c.all({contains(it)})
+            override fun contains(element: MatchGroup?): Boolean = this.any { it == element }
+            override fun containsAll(elements: Collection<MatchGroup?>): Boolean = elements.all { contains(it) }
 
             override fun iterator(): Iterator<MatchGroup?> = indices.asSequence().map { this[it] }.iterator()
 
diff --git a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
index 7de8567e3ba..166a8e507f5 100644
--- a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
@@ -93,7 +93,7 @@ private class MutableMapWithDefaultImpl<K, V>(public override val map: MutableMa
 
     override fun put(key: K, value: V): V? = map.put(key, value)
     override fun remove(key: K): V? = map.remove(key)
-    override fun putAll(m: Map<out K, V>) = map.putAll(m)
+    override fun putAll(from: Map<out K, V>) = map.putAll(from)
     override fun clear() = map.clear()
 
     override fun getOrImplicitDefault(key: K): V = map.getOrElseNullable(key, { default(key) })
diff --git a/libraries/stdlib/src/kotlin/io/files/Utils.kt b/libraries/stdlib/src/kotlin/io/files/Utils.kt
index dbd0a6789b0..c55abe63b30 100644
--- a/libraries/stdlib/src/kotlin/io/files/Utils.kt
+++ b/libraries/stdlib/src/kotlin/io/files/Utils.kt
@@ -4,7 +4,6 @@
 package kotlin.io
 
 import java.io.*
-import java.nio.charset.Charset
 import java.util.*
 
 /**
diff --git a/libraries/stdlib/src/kotlin/text/Indent.kt b/libraries/stdlib/src/kotlin/text/Indent.kt
index 6f33be2a640..5fd94d29b28 100644
--- a/libraries/stdlib/src/kotlin/text/Indent.kt
+++ b/libraries/stdlib/src/kotlin/text/Indent.kt
@@ -114,7 +114,7 @@ private inline fun List<String>.reindent(resultSizeEstimate: Int, indentAddFunct
             if ((index == 0 || index == lastIndex) && value.isBlank())
                 null
             else
-                indentCutFunction(value)?.let { cutted -> indentAddFunction(cutted) } ?: value
+                indentCutFunction(value)?.let(indentAddFunction) ?: value
         }
         .joinTo(StringBuilder(resultSizeEstimate), "\n")
         .toString()
diff --git a/libraries/stdlib/src/kotlin/text/regex/Regex.kt b/libraries/stdlib/src/kotlin/text/regex/Regex.kt
index 318b10fa01f..44e638affa6 100644
--- a/libraries/stdlib/src/kotlin/text/regex/Regex.kt
+++ b/libraries/stdlib/src/kotlin/text/regex/Regex.kt
@@ -234,8 +234,8 @@ private class MatcherMatchResult(private val matcher: Matcher, private val input
     override val groups: MatchGroupCollection = object : MatchGroupCollection {
         override val size: Int get() = matchResult.groupCount() + 1
         override fun isEmpty(): Boolean = false
-        override fun contains(o: MatchGroup?): Boolean = this.any({ it == o })
-        override fun containsAll(c: Collection<MatchGroup?>): Boolean = c.all({contains(it)})
+        override fun contains(element: MatchGroup?): Boolean = this.any { it == element }
+        override fun containsAll(elements: Collection<MatchGroup?>): Boolean = elements.all { contains(it) }
 
         override fun iterator(): Iterator<MatchGroup?> = indices.asSequence().map { this[it] }.iterator()
         override fun get(index: Int): MatchGroup? {
diff --git a/libraries/stdlib/src/kotlin/util/Lazy.kt b/libraries/stdlib/src/kotlin/util/Lazy.kt
index 025ef7a4c2c..89d0650a2ed 100644
--- a/libraries/stdlib/src/kotlin/util/Lazy.kt
+++ b/libraries/stdlib/src/kotlin/util/Lazy.kt
@@ -15,12 +15,12 @@ public interface Lazy<out T> {
      * Gets the lazily initialized value of the current Lazy instance.
      * Once the value was initialized it must not change during the rest of lifetime of this Lazy instance.
      */
-    public abstract val value: T
+    public val value: T
     /**
      * Returns `true` if a value for this Lazy instance has been already initialized, and `false` otherwise.
      * Once this function has returned `true` it stays `true` for the rest of lifetime of this Lazy instance.
      */
-    public abstract fun isInitialized(): Boolean
+    public fun isInitialized(): Boolean
 }
 
 /**