diff options
author | ccalvarin <ccalvarin@google.com> | 2017-11-03 20:32:41 +0100 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-11-29 11:28:07 -0800 |
commit | 8095de2eba76d6b60bbdd23b025eed4671e7f812 (patch) | |
tree | e4470e414c5e154b878d865fd618ab9dfa81805b | |
parent | 9582b4d73d71cb9363b528bb780d416b9512195b (diff) | |
download | desugar-8095de2eba76d6b60bbdd23b025eed4671e7f812.tar.gz |
Cleanup stream use in canonical list of options.
Follow up to https://github.com/bazelbuild/bazel/commit/c50cd13c75a2a1685f5ac9bd70561ac1e50722e7
RELNOTES: None.
PiperOrigin-RevId: 174498205
GitOrigin-RevId: fecf464ec3bf2593e31fa6cd25a45ce149c2dd75
Change-Id: Ife1674dc14b8276510df9730e84416863b79a59f
-rw-r--r-- | java/com/google/devtools/common/options/OptionsParserImpl.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/java/com/google/devtools/common/options/OptionsParserImpl.java b/java/com/google/devtools/common/options/OptionsParserImpl.java index 96f70f3..d89aad3 100644 --- a/java/com/google/devtools/common/options/OptionsParserImpl.java +++ b/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()}. */ |