diff options
author | 2018-06-20 15:22:33 -0700 | |
---|---|---|
committer | 2018-06-20 15:23:54 -0700 | |
commit | c19284e3e8db5ed57097ed908c76dc902392c7ee (patch) | |
tree | 9bcd7b0b90afa18e0eb70e8854fa09b937386548 /src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java | |
parent | bccf9c63ff0863e3ffb4fb24085a37a03db10aaa (diff) |
Remove all uses of RuleDefinitionEnvironment#getLabel, replacing them with Label.parseAbsoluteUnchecked. Label already interns all labels, so the additional interning being done in every ConfiguredRuleClass.Builder was pointless memory and CPU.
Keeping the RuleDefinitionEnvironment around makes things harder to serialize.
Done using IntelliJ structural replace and then a super-painful adding of imports to every file that didn't compile (have to learn a better way to do this).
PiperOrigin-RevId: 201427027
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java index 4ef326149f..0aa30d4273 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java @@ -58,8 +58,8 @@ public class ConstraintsTest extends AbstractConstraintsTest { public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .setUndocumented() - .compatibleWith(env.getLabel("//buildenv/rule_class_compat:b")) - .restrictedTo(env.getLabel("//buildenv/rule_class_restrict:d")) + .compatibleWith(Label.parseAbsoluteUnchecked("//buildenv/rule_class_compat:b")) + .restrictedTo(Label.parseAbsoluteUnchecked("//buildenv/rule_class_restrict:d")) .build(); } @@ -77,15 +77,19 @@ public class ConstraintsTest extends AbstractConstraintsTest { * Dummy rule class for testing rule class defaults. This class applies invalid defaults. Note * that the specified environments must be independently created. */ - private static final MockRule BAD_RULE_CLASS_DEFAULT_RULE = () -> MockRule.define( - "bad_rule_class_default", - (builder, env) -> - builder - .setUndocumented() - // These defaults are invalid since compatibleWith and restrictedTo can't mix - // environments from the same group. - .compatibleWith(env.getLabel("//buildenv/rule_class_compat:a")) - .restrictedTo(env.getLabel("//buildenv/rule_class_compat:b"))); + private static final MockRule BAD_RULE_CLASS_DEFAULT_RULE = + () -> + MockRule.define( + "bad_rule_class_default", + (builder, env) -> + builder + .setUndocumented() + // These defaults are invalid since compatibleWith and restrictedTo can't mix + // environments from the same group. + .compatibleWith( + Label.parseAbsoluteUnchecked("//buildenv/rule_class_compat:a")) + .restrictedTo( + Label.parseAbsoluteUnchecked("//buildenv/rule_class_compat:b"))); private static final MockRule RULE_WITH_IMPLICIT_AND_LATEBOUND_DEFAULTS = () -> |