From 657abffea2c6e042c6d41c7f5d505c9cdb113429 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 9 Jun 2015 16:10:33 +0300
Subject: [PATCH] Minor code improvement

---
 .../kotlin/renderer/DescriptorRendererImpl.kt        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 3881bba30e7..5924f4eb4d0 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -585,15 +585,11 @@ internal class DescriptorRendererImpl(
         val upperBoundStrings = ArrayList<String>(0)
 
         for (typeParameter in typeParameters) {
-            if (typeParameter.getUpperBounds().size() > 1) {
-                for ((i, upperBound) in typeParameter.getUpperBounds().withIndex()) {
-                    // first parameter is rendered by renderTypeParameter:
-                    if (i > 0) {
-                        upperBoundStrings.add(renderName(typeParameter.getName()) + " : " + escape(renderType(upperBound)))
-                    }
-                }
-            }
+            typeParameter.getUpperBounds()
+                    .drop(1) // first parameter is rendered by renderTypeParameter
+                    .mapTo(upperBoundStrings) { renderName(typeParameter.getName()) + " : " + escape(renderType(it)) }
         }
+
         if (!upperBoundStrings.isEmpty()) {
             builder.append(" ").append(renderKeyword("where")).append(" ")
             upperBoundStrings.joinTo(builder, ", ")