diff options
author | dannark <dannark@google.com> | 2018-06-22 11:44:27 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-22 11:46:15 -0700 |
commit | da327bbeaf01ac109bf6262cda765c99228eddee (patch) | |
tree | 5677f7f9136eac0616e3df3fd68153b0d53c4fff /src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java | |
parent | ecc922017637b19cbd98381f4a0067b5422d2d31 (diff) |
Remove Label.parseAbsolute(string, boolean). The goal is to get rid of all label methods that don't explicitly pass a repository mapping.
RELNOTES: None
PiperOrigin-RevId: 201717665
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java index ddc6ab5689..e85915f3b9 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java @@ -100,16 +100,21 @@ public class SkylarkRuleClassFunctions implements SkylarkRuleFunctionsApi<Artifa // If we don't want to support old built-in rules and Skylark simultaneously // (except for transition phase) it's probably OK. private static final LoadingCache<String, Label> labelCache = - CacheBuilder.newBuilder().build(new CacheLoader<String, Label>() { - @Override - public Label load(String from) throws Exception { - try { - return Label.parseAbsolute(from, false); - } catch (LabelSyntaxException e) { - throw new Exception(from); - } - } - }); + CacheBuilder.newBuilder() + .build( + new CacheLoader<String, Label>() { + @Override + public Label load(String from) throws Exception { + try { + return Label.parseAbsolute( + from, + /* defaultToMain=*/ false, + /* repositoryMapping= */ ImmutableMap.of()); + } catch (LabelSyntaxException e) { + throw new Exception(from); + } + } + }); // TODO(bazel-team): Remove the code duplication (BaseRuleClasses and this class). /** Parent rule class for non-executable non-test Skylark rules. */ |