diff options
| author |  cparsons <cparsons@google.com> | 2018-07-13 11:47:17 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-13 11:48:44 -0700 |
| commit | 23aab171d93d7a6a0945b64fecf3e2094626e1fc (patch) | |
| tree | 71225019cc278c8faed35dd86d8b4b959b294b55 /src/main/java/com/google/devtools/build/lib/skylarkinterface | |
| parent | 32e9fee4e2192a340d0b1823538bf8e9fdf92b65 (diff) | |
Remove SkylarkCallable.mandatoryPositionals
RELNOTES: None.
PiperOrigin-RevId: 204505003
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skylarkinterface')
2 files changed, 2 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkinterface/SkylarkCallable.java b/src/main/java/com/google/devtools/build/lib/skylarkinterface/SkylarkCallable.java index c89e06fc6a..7bc40efef5 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkinterface/SkylarkCallable.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkinterface/SkylarkCallable.java @@ -84,19 +84,7 @@ public @interface SkylarkCallable { boolean structField() default false; /** - * Number of parameters in the signature that are mandatory positional parameters. Any parameter - * after {@link #mandatoryPositionals()} must be specified in {@link #parameters()}. A negative - * value (default is {@code -1}), means that all arguments are mandatory positionals if {@link - * #parameters()} remains empty. If {@link #parameters()} is non empty, then a negative value for - * {@link #mandatoryPositionals()} is taken as 0. - * - * @deprecated specify parameters via the {@link #parameters} field instead - */ - @Deprecated - int mandatoryPositionals() default -1; - - /** - * List of parameters this function accept after the {@link #mandatoryPositionals()} parameters. + * List of parameters this function accepts. */ Param[] parameters() default {}; 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 a2d43ae528..09f18f96a3 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 @@ -265,8 +265,7 @@ public final class SkylarkCallableProcessor extends AbstractProcessor { List<? extends VariableElement> methodSignatureParams = methodElement.getParameters(); int numExtraInterpreterParams = numExpectedExtraInterpreterParams(annotation); - int numDeclaredArgs = - annotation.parameters().length + Math.max(0, annotation.mandatoryPositionals()); + int numDeclaredArgs = annotation.parameters().length; if (methodSignatureParams.size() != numDeclaredArgs + numExtraInterpreterParams) { throw new SkylarkCallableProcessorException( methodElement, |