diff options
| author |  tomlu <tomlu@google.com> | 2018-04-16 19:46:20 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-16 19:47:55 -0700 |
| commit | 4e6af40b8902bffb1bca480bb38dfe2421065ee1 (patch) | |
| tree | ae44ab1ebf79a7a753cefb8384d52e9b0cf059d2 /src/main/java/com/google/devtools/build/lib/analysis/skylark | |
| parent | 6c63544eefee5e76bca20b11d2e6f2c8e667988c (diff) | |
Change default value of 'tools' attribute to unbound.
We do not wish to support the attribute being Noneable forever.
RELNOTES: None
PiperOrigin-RevId: 193139282
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/skylark')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java | 3 |
2 files changed, 4 insertions, 7 deletions
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 a3878a6300..416a62a5a0 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 @@ public class SkylarkActionFactory implements SkylarkValue { @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 @@ public class SkylarkActionFactory implements SkylarkValue { @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 @@ public class SkylarkActionFactory implements SkylarkValue { } 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 73c5a89e5b..2bc5fbce64 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 @@ public final class SkylarkRuleContext implements SkylarkValue { @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." |