From 9823b3dbd47a624cebf28e90cf9feb3eccbad49a Mon Sep 17 00:00:00 2001 From: James Lin Date: Thu, 15 Aug 2019 11:12:08 -0700 Subject: [PATCH] Update with more review feedback from jonahwilliams * Remove the identity() function. * Make _flattenMap private. * Don't bother with ungrowable lists. --- dev/bots/run_command.dart | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dev/bots/run_command.dart b/dev/bots/run_command.dart index 6d3301d373..a5a371997c 100644 --- a/dev/bots/run_command.dart +++ b/dev/bots/run_command.dart @@ -136,8 +136,8 @@ Future runCommand(String executable, List arguments, { print('$clock ELAPSED TIME: $bold${elapsedTime(start)}$reset for $commandDescription in $relativeWorkingDir: '); if (output != null) { - output.stdout = flattenToString(await savedStdout); - output.stderr = flattenToString(await savedStderr); + output.stdout = _flattenToString(await savedStdout); + output.stderr = _flattenToString(await savedStderr); } // If the test is flaky we don't care about the actual exit. @@ -156,8 +156,8 @@ Future runCommand(String executable, List arguments, { break; case OutputMode.capture: case OutputMode.discard: - stdout.writeln(flattenToString(await savedStdout)); - stderr.writeln(flattenToString(await savedStderr)); + stdout.writeln(_flattenToString(await savedStdout)); + stderr.writeln(_flattenToString(await savedStderr)); break; } print( @@ -171,11 +171,9 @@ Future runCommand(String executable, List arguments, { } } -T identity(T x) => x; - /// Flattens a nested list of UTF-8 code units into a single string. -String flattenToString(List> chunks) => - utf8.decode(chunks.expand(identity).toList(growable: false)); +String _flattenToString(List> chunks) => + utf8.decode(chunks.expand((List ints) => ints).toList()); /// Specifies what to do with command output from [runCommand]. enum OutputMode { print, capture, discard }