From 6849fb8358879a7f38b3947d652f6605ab5a12a4 Mon Sep 17 00:00:00 2001
From: Ilya Ryzhenkov <orangy@jetbrains.com>
Date: Mon, 9 Jun 2014 23:22:38 +0400
Subject: [PATCH] Map.toList() returns List of Pairs instead of List of
 Entries.

---
 libraries/stdlib/src/generated/_Snapshots.kt                | 6 +++---
 .../tools/kotlin-stdlib-gen/src/templates/Snapshots.kt      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/stdlib/src/generated/_Snapshots.kt b/libraries/stdlib/src/generated/_Snapshots.kt
index 75336daf906..8b88e8c5833 100644
--- a/libraries/stdlib/src/generated/_Snapshots.kt
+++ b/libraries/stdlib/src/generated/_Snapshots.kt
@@ -400,10 +400,10 @@ public fun String.toLinkedList(): LinkedList<Char> {
 /**
  * Returns a List containing all key-value pairs
  */
-public fun <K, V> Map<K, V>.toList(): List<Map.Entry<K, V>> {
-    val result = ArrayList<Map.Entry<K, V>>(size)
+public fun <K, V> Map<K, V>.toList(): List<Pair<K, V>> {
+    val result = ArrayList<Pair<K, V>>(size)
     for (item in this)
-        result.add(item)
+        result.add(item.key to item.value)
     return result
 }
 
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Snapshots.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Snapshots.kt
index 46531b16dee..40028f43a50 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Snapshots.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Snapshots.kt
@@ -62,12 +62,12 @@ fun snapshots(): List<GenericFunction> {
     templates add f("toList()") {
         only(Maps)
         doc { "Returns a List containing all key-value pairs" }
-        returns("List<Map.Entry<K, V>>")
+        returns("List<Pair<K, V>>")
         body {
             """
-            val result = ArrayList<Map.Entry<K, V>>(size)
+            val result = ArrayList<Pair<K, V>>(size)
             for (item in this)
-                result.add(item)
+                result.add(item.key to item.value)
             return result
             """
         }