aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar vladmos <vladmos@google.com>2017-06-19 12:44:21 -0400
committerGravatar Kristina Chodorow <kchodorow@google.com>2017-06-20 14:35:06 -0400
commit2f32e38826db0325f44f5a385dd958299fb8461d (patch)
treed2a551935b7681e5bb0af5b5b324775cb3ce7e5f /src/main
parentd5cb982844815dbd01ceb0d1439b485afdfb1ed4 (diff)
Rule functions should return None instead of internal Rule objects
PiperOrigin-RevId: 159438112
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
index 004b215346..03e423d7db 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
@@ -764,13 +764,14 @@ public class SkylarkRuleClassFunctions {
"Cannot instantiate a rule when loading a .bzl file. Rules can only be called from "
+ "a BUILD file (possibly via a macro).");
}
- return RuleFactory.createAndAddRule(
+ RuleFactory.createAndAddRule(
pkgContext,
ruleClass,
attributeValues,
ast,
env,
pkgContext.getAttributeContainerFactory().apply(ruleClass));
+ return Runtime.NONE;
} catch (InvalidRuleException | NameConflictException e) {
throw new EvalException(ast.getLocation(), e.getMessage());
}