From 70381434ff4929ba6ee6a672185c356190e6095a Mon Sep 17 00:00:00 2001 From: jcater Date: Thu, 6 May 2021 07:59:26 -0700 Subject: [PATCH] Rename ToolchainCollection.getExecGroups to getExecGroupNames. PiperOrigin-RevId: 372343218 --- .../devtools/build/lib/analysis/ExecGroupCollection.java | 4 ++-- .../com/google/devtools/build/lib/analysis/RuleContext.java | 2 +- .../devtools/build/lib/analysis/ToolchainCollection.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java index 6059857ee5b554..8e68a36aebc867 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java @@ -56,7 +56,7 @@ public static boolean isValidGroupName(String execGroupName) { public boolean containsKey(StarlarkSemantics semantics, Object key) throws EvalException { String group = castGroupName(key); return !DEFAULT_EXEC_GROUP_NAME.equals(group) - && toolchainCollection().getExecGroups().contains(group); + && toolchainCollection().getExecGroupNames().contains(group); } /** @@ -95,7 +95,7 @@ public void repr(Printer printer) { } private List getScrubbedExecGroups() { - return toolchainCollection().getExecGroups().stream() + return toolchainCollection().getExecGroupNames().stream() .filter(group -> !DEFAULT_EXEC_GROUP_NAME.equals(group)) .sorted() .collect(Collectors.toList()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java index 44d90212dda57b..410d88638e45aa 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java @@ -1279,7 +1279,7 @@ private ImmutableTable parseExecProperties( return ImmutableTable.of(); } else { return parseExecProperties( - execProperties, toolchainContexts == null ? null : toolchainContexts.getExecGroups()); + execProperties, toolchainContexts == null ? null : toolchainContexts.getExecGroupNames()); } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java index a7457f8861de60..d7c1bff64a1c94 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java @@ -59,7 +59,7 @@ public ImmutableSet