From 597f2c0a8c744683fc5858c8202cb92556579667 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 26 Nov 2015 15:44:32 +0300
Subject: [PATCH] Final moves: map delegating accessors and timing utils

---
 .../kotlin/{properties => collections}/MapAccessors.kt    | 2 +-
 libraries/stdlib/src/kotlin/properties/Delegation.kt      | 4 ++--
 .../src/kotlin/{util/SystemJVM.kt => system/Timing.kt}    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename libraries/stdlib/src/kotlin/{properties => collections}/MapAccessors.kt (98%)
 rename libraries/stdlib/src/kotlin/{util/SystemJVM.kt => system/Timing.kt} (65%)

diff --git a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt b/libraries/stdlib/src/kotlin/collections/MapAccessors.kt
similarity index 98%
rename from libraries/stdlib/src/kotlin/properties/MapAccessors.kt
rename to libraries/stdlib/src/kotlin/collections/MapAccessors.kt
index 29761fe790f..8e1bf5a6c79 100644
--- a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapAccessors.kt
@@ -1,5 +1,5 @@
 @file:kotlin.jvm.JvmName("MapAccessorsKt")
-package kotlin.properties
+package kotlin.collections
 
 import kotlin.reflect.KProperty
 import kotlin.internal.Exact
diff --git a/libraries/stdlib/src/kotlin/properties/Delegation.kt b/libraries/stdlib/src/kotlin/properties/Delegation.kt
index 924c293c148..d133124e6bc 100644
--- a/libraries/stdlib/src/kotlin/properties/Delegation.kt
+++ b/libraries/stdlib/src/kotlin/properties/Delegation.kt
@@ -44,7 +44,7 @@ public object Delegates {
      * as a key.
      * @param map the map where the property values are stored.
      */
-    @Deprecated("Delegate property to the map itself without creating a wrapper.", ReplaceWith("map", "kotlin.properties.get", "kotlin.properties.set"))
+    @Deprecated("Delegate property to the map itself without creating a wrapper.", ReplaceWith("map"))
     public fun <T> mapVar(map: MutableMap<in String, Any?>): ReadWriteProperty<Any?, T> {
         return FixedMapVar<Any?, String, T>(map, propertyNameSelector, throwKeyNotFound)
     }
@@ -66,7 +66,7 @@ public object Delegates {
      * as a key.
      * @param map the map where the property values are stored.
      */
-    @Deprecated("Delegate property to the map itself without creating a wrapper.", ReplaceWith("map", "kotlin.properties.get"))
+    @Deprecated("Delegate property to the map itself without creating a wrapper.", ReplaceWith("map"))
     public fun <T> mapVal(map: Map<in String, Any?>): ReadOnlyProperty<Any?, T> {
         return FixedMapVal<Any?, String, T>(map, propertyNameSelector, throwKeyNotFound)
     }
diff --git a/libraries/stdlib/src/kotlin/util/SystemJVM.kt b/libraries/stdlib/src/kotlin/system/Timing.kt
similarity index 65%
rename from libraries/stdlib/src/kotlin/util/SystemJVM.kt
rename to libraries/stdlib/src/kotlin/system/Timing.kt
index 3a9f8bb21aa..ef876241fb5 100644
--- a/libraries/stdlib/src/kotlin/util/SystemJVM.kt
+++ b/libraries/stdlib/src/kotlin/system/Timing.kt
@@ -1,10 +1,10 @@
-@file:kotlin.jvm.JvmName("TimingUtilsKt")
-package kotlin.util
+@file:kotlin.jvm.JvmName("TimingKt")
+package kotlin.system
 
 /**
  * Executes the given block and returns elapsed time in milliseconds.
  */
-public fun measureTimeMillis(block: () -> Unit) : Long {
+public inline fun measureTimeMillis(block: () -> Unit) : Long {
     val start = System.currentTimeMillis()
     block()
     return System.currentTimeMillis() - start
@@ -13,7 +13,7 @@ public fun measureTimeMillis(block: () -> Unit) : Long {
 /**
  * Executes the given block and returns elapsed time in nanoseconds.
  */
-public fun measureTimeNano(block: () -> Unit) : Long {
+public inline fun measureTimeNano(block: () -> Unit) : Long {
     val start = System.nanoTime()
     block()
     return System.nanoTime() - start