Cleanup stream use in canonical list of options.

Follow up to https://github.com/bazelbuild/bazel/commit/c50cd13c75a2a1685f5ac9bd70561ac1e50722e7

RELNOTES: None.
PiperOrigin-RevId: 174498205

1 files changed, 9 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java b/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java
index 96f70f3a2e..d89aad302c 100644
--- a/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java
+++ b/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java
@@ -129,25 +129,23 @@ class OptionsParserImpl {
         .collect(toCollection(ArrayList::new));
   }
 
-  private Stream<ParsedOptionDescription> asStreamOfCanonicalParsedOptions() {
-    return optionValues
-        .keySet()
-        .stream()
-        .sorted()
-        .map(optionDefinition -> optionValues.get(optionDefinition).getCanonicalInstances())
-        .flatMap(Collection::stream);
-  }
-
   /** Implements {@link OptionsParser#canonicalize}. */
   List<String> asCanonicalizedList() {
-    return asStreamOfCanonicalParsedOptions()
+    return asCanonicalizedListOfParsedOptions()
+        .stream()
         .map(ParsedOptionDescription::getDeprecatedCanonicalForm)
         .collect(ImmutableList.toImmutableList());
   }
 
   /** Implements {@link OptionsParser#canonicalize}. */
   List<ParsedOptionDescription> asCanonicalizedListOfParsedOptions() {
-    return asStreamOfCanonicalParsedOptions().collect(ImmutableList.toImmutableList());
+    return optionValues
+        .keySet()
+        .stream()
+        .sorted()
+        .map(optionDefinition -> optionValues.get(optionDefinition).getCanonicalInstances())
+        .flatMap(Collection::stream)
+        .collect(ImmutableList.toImmutableList());
   }
 
   /** Implements {@link OptionsParser#asListOfOptionValues()}. */