summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2021-05-12 21:56:31 +0000
committerAurimas Liutikas <aurimas@google.com>2021-05-12 21:56:31 +0000
commitc5b4071877530ba3eb6ce5f55fc8c101ea1f35e4 (patch)
tree252e33b26e09220f10e51ed33f1f02299321dba9 /tools
parentb8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911 (diff)
Revert "Fix incompatibilities with Kotlin 1.5.0"
This reverts commit b8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911. Reason for revert: b/187908823 Change-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d
Diffstat (limited to 'tools')
-rw-r--r--tools/codegen/src/com/android/codegen/Utils.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/codegen/src/com/android/codegen/Utils.kt b/tools/codegen/src/com/android/codegen/Utils.kt
index a117aa09ab62..c19ae3b0b11f 100644
--- a/tools/codegen/src/com/android/codegen/Utils.kt
+++ b/tools/codegen/src/com/android/codegen/Utils.kt
@@ -43,8 +43,8 @@ inline infix fun Int.times(action: () -> Unit) {
* cccc dd
*/
fun Iterable<Pair<String, String>>.columnize(separator: String = " | "): String {
- val col1w = map { (a, _) -> a.length }.maxOrNull()!!
- val col2w = map { (_, b) -> b.length }.maxOrNull()!!
+ val col1w = map { (a, _) -> a.length }.max()!!
+ val col2w = map { (_, b) -> b.length }.max()!!
return map { it.first.padEnd(col1w) + separator + it.second.padEnd(col2w) }.joinToString("\n")
}