Change default value of 'tools' attribute to unbound. We do not wish to support the attribute being Noneable forever. RELNOTES: None PiperOrigin-RevId: 193139282
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java index a3878a6..416a62a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
@@ -327,10 +327,9 @@ @ParamType(type = SkylarkNestedSet.class), }, generic1 = Artifact.class, - defaultValue = "None", + defaultValue = "unbound", named = true, positional = false, - noneable = true, doc = "List or depset of any tools needed by the action. Tools are inputs with additional " + "runfiles that are automatically made available to the action." @@ -519,10 +518,9 @@ @ParamType(type = SkylarkNestedSet.class), }, generic1 = Artifact.class, - defaultValue = "None", + defaultValue = "unbound", named = true, positional = false, - noneable = true, doc = "List or depset of any tools needed by the action. Tools are inputs with additional " + "runfiles that are automatically made available to the action." @@ -764,7 +762,7 @@ } builder.addOutputs(outputs.getContents(Artifact.class, "outputs")); - if (toolsUnchecked != Runtime.NONE) { + if (toolsUnchecked != Runtime.UNBOUND) { final Iterable<Artifact> toolsIterable; if (toolsUnchecked instanceof SkylarkList) { toolsIterable = ((SkylarkList) toolsUnchecked).getContents(Artifact.class, "tools");
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java index 73c5a89..2bc5fbc 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
@@ -1093,10 +1093,9 @@ @ParamType(type = SkylarkNestedSet.class), }, generic1 = Artifact.class, - defaultValue = "None", + defaultValue = "unbound", named = true, positional = false, - noneable = true, doc = "List of the any tools needed by the action. Tools are inputs with additional " + "runfiles that are automatically made available to the action."