diff options
author | cparsons <cparsons@google.com> | 2018-06-20 10:41:48 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-20 10:43:27 -0700 |
commit | 07460fc320b774cbd6def67dad983932f7cad1a7 (patch) | |
tree | aec96c5453ecb2903ca1e011097653af82d51cdb /src/main/java/com/google/devtools/build/lib/skylarkinterface | |
parent | e06e9d4700c4b7af8f5bcec941981857334af9b1 (diff) |
Allow structField callables to specify useSkylarkSemantics, useLocation, and useEnvironment
Unfortunately this doesn't work for all callers, namely NativeInfo objects, as they may have structField callables invoked from contexts that have no environment available.
RELNOTES[INC]: Skylark structs (using struct()) may no longer have to_json and to_proto overridden.
PiperOrigin-RevId: 201376969
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skylarkinterface')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java b/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java index 71df625cba..2ccc6ccb49 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java @@ -158,14 +158,12 @@ public final class SkylarkCallableProcessor extends AbstractProcessor { throws SkylarkCallableProcessorException { if (annotation.structField()) { if (annotation.useAst() - || annotation.useEnvironment() - || annotation.useAst() || !annotation.extraPositionals().name().isEmpty() || !annotation.extraKeywords().name().isEmpty()) { throw new SkylarkCallableProcessorException( methodElement, "@SkylarkCallable-annotated methods with structField=true may not also specify " - + "useAst, useEnvironment, useLocation, extraPositionals, or extraKeywords"); + + "useAst, extraPositionals, or extraKeywords"); } } } |