summaryrefslogtreecommitdiff
path: root/tools/codegen/src
diff options
context:
space:
mode:
author Aurimas Liutikas <aurimas@google.com> 2021-05-12 22:03:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-05-12 22:03:25 +0000
commitf1e2bb9a8147a6614ea10577da187f93c282e305 (patch)
treee4976b39730c675acb5f1cb977366a2e4e50abac /tools/codegen/src
parent1742bf024c61f1ec0b6338f674836b30759e6e15 (diff)
parentc5b4071877530ba3eb6ce5f55fc8c101ea1f35e4 (diff)
Merge "Revert "Fix incompatibilities with Kotlin 1.5.0""
Diffstat (limited to 'tools/codegen/src')
-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")
}