commit c06e7468d9f14a3e950e1e81d1c774b1f476081e
author brandjon <brandjon@google.com> Tue Jul 11 20:54:58 2017 +0200
committer László Csomor <laszlocsomor@google.com> Wed Jul 12 08:49:49 2017 +0200
tree a2d63050dd6a6475f1a1504b0266335ffb60ecdb
parent b8ed52129f6884ca7b7a40b4a6f515797a7f6fa6

Misc cleanups of syntax dir

RELNOTES: None
PiperOrigin-RevId: 161560683

src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
index 5852386..cce162e 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
@@ -34,7 +34,7 @@
 public class BuiltinFunction extends BaseFunction {
 
   /** ExtraArgKind so you can tweek your function's own calling convention */
-  public static enum ExtraArgKind {
+  public enum ExtraArgKind {
     LOCATION,
     SYNTAX_TREE,
     ENVIRONMENT;
@@ -305,7 +305,7 @@
       }
     }
     // No need for the enforcedArgumentTypes List if all the types were Simple
-    enforcedArgumentTypes = FunctionSignature.<SkylarkType>valueListOrNull(enforcedArgumentTypes);
+    enforcedArgumentTypes = FunctionSignature.valueListOrNull(enforcedArgumentTypes);
 
     if (returnType != null) {
       Class<?> type = returnType;