diff options
| author | 2021-05-18 23:17:14 +0000 | |
|---|---|---|
| committer | 2021-05-18 23:17:14 +0000 | |
| commit | 6a958235ec6efd2d9cea45e095fde89d41c7942a (patch) | |
| tree | 2c47f57488d23a055242e5a8af0cc4f063edc62c /tools/codegen/src | |
| parent | edd6684f8879aa69a12671fec535bdcdae5c1e25 (diff) | |
| parent | c4db697186c4e56c24bec2cee7b16de27facedd8 (diff) | |
Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" am: b7bccf0c76 am: c4db697186
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709778
Change-Id: If3e51f818d2ac479af7f829b0781fbefffe028f4
Diffstat (limited to 'tools/codegen/src')
| -rw-r--r-- | tools/codegen/src/com/android/codegen/Utils.kt | 4 |
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 7cfa7847fcff..9ceb2042d74e 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 }.max()!! - val col2w = map { (_, b) -> b.length }.max()!! + val col1w = map { (a, _) -> a.length }.maxOrNull()!! + val col2w = map { (_, b) -> b.length }.maxOrNull()!! return map { it.first.padEnd(col1w) + separator + it.second.padEnd(col2w) }.joinToString("\n") } |