From 2f32e38826db0325f44f5a385dd958299fb8461d Mon Sep 17 00:00:00 2001 From: vladmos Date: Mon, 19 Jun 2017 12:44:21 -0400 Subject: Rule functions should return None instead of internal Rule objects PiperOrigin-RevId: 159438112 --- .../com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main') 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()); } -- cgit v1.2.3