starlark: delete redundant StarlarkDeprecated annotation Its entire effect was to add the string "(Deprecated)" to the skydoc output. This is redundant with the doc strings of all such annotated methods, and uninformative: Why is it deprecated? Will it be deleted? What should one use instead? Also, we already have one complete mechanism for experimental or deprecated functions and parameters: FlagControlledValue. PiperOrigin-RevId: 333109275

diff --git a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkBuiltinDoc.java b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkBuiltinDoc.java
index fb61927..46bae35e 100644
--- a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkBuiltinDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkBuiltinDoc.java

@@ -25,7 +25,6 @@
 import java.util.TreeMap;
 import javax.annotation.Nullable;
 import net.starlark.java.annot.StarlarkBuiltin;
-import net.starlark.java.annot.StarlarkDeprecated;
 import net.starlark.java.annot.StarlarkMethod;
 
 /**
@@ -38,7 +37,6 @@
   private final Multimap<String, StarlarkJavaMethodDoc> javaMethods;
   private TreeMap<String, StarlarkMethodDoc> methodMap;
   private final String title;
-  private final boolean deprecated;
   @Nullable private StarlarkConstructorMethodDoc javaConstructor;
 
   public StarlarkBuiltinDoc(StarlarkBuiltin module, Class<?> classObject) {
@@ -48,7 +46,6 @@
     this.classObject = classObject;
     this.methodMap = new TreeMap<>(Collator.getInstance(Locale.US));
     this.javaMethods = HashMultimap.<String, StarlarkJavaMethodDoc>create();
-    this.deprecated = classObject.isAnnotationPresent(StarlarkDeprecated.class);
     if (module.title().isEmpty()) {
       this.title = module.name();
     } else {
@@ -70,11 +67,6 @@
     return title;
   }
 
-  @Override
-  public boolean isDeprecated() {
-    return deprecated;
-  }
-
   public StarlarkBuiltin getAnnotation() {
     return module;
   }

diff --git a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkConstructorMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkConstructorMethodDoc.java
index 3f89d3b..1865c55e 100644
--- a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkConstructorMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkConstructorMethodDoc.java

@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableList;
 import java.lang.reflect.Method;
 import java.util.List;
-import net.starlark.java.annot.StarlarkDeprecated;
 import net.starlark.java.annot.StarlarkMethod;
 import net.starlark.java.eval.Starlark;
 
@@ -29,8 +28,6 @@
   private final Method method;
   private final StarlarkMethod callable;
   private final ImmutableList<StarlarkParamDoc> params;
-  // TODO(cparsons): Move to superclass when StarlarkBuiltinMethodDoc is removed.
-  private final boolean deprecated;
 
   public StarlarkConstructorMethodDoc(
       String fullyQualifiedName, Method method, StarlarkMethod callable) {
@@ -43,12 +40,6 @@
             withoutSelfParam(callable, method),
             callable.extraPositionals(),
             callable.extraKeywords());
-    this.deprecated = method.isAnnotationPresent(StarlarkDeprecated.class);
-  }
-
-  @Override
-  public boolean isDeprecated() {
-    return deprecated;
   }
 
   @Override

diff --git a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkDoc.java b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkDoc.java
index c7df5d4..d283742 100644
--- a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkDoc.java

@@ -42,9 +42,6 @@
    */
   public abstract String getDocumentation();
 
-  /** Returns true if this entity should be considered "deprecated" for documentation purposes. */
-  public abstract boolean isDeprecated();
-
   protected String getTypeAnchor(Class<?> returnType, Class<?> generic1) {
     return getTypeAnchor(returnType) + " of " + getTypeAnchor(generic1) + "s";
   }

diff --git a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkJavaMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkJavaMethodDoc.java
index b2210ce..10fbbcf 100644
--- a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkJavaMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkJavaMethodDoc.java

@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.starlark.java.annot.Param;
-import net.starlark.java.annot.StarlarkDeprecated;
 import net.starlark.java.annot.StarlarkInterfaceUtils;
 import net.starlark.java.annot.StarlarkMethod;
 import net.starlark.java.eval.Starlark;
@@ -31,8 +30,6 @@
   private final Method method;
   private final StarlarkMethod callable;
   private final ImmutableList<StarlarkParamDoc> params;
-  // TODO(cparsons): Move to superclass when StarlarkBuiltinMethodDoc is removed.
-  private final boolean deprecated;
 
   private boolean isOverloaded;
 
@@ -47,7 +44,6 @@
             withoutSelfParam(callable, method),
             callable.extraPositionals(),
             callable.extraKeywords());
-    this.deprecated = method.isAnnotationPresent(StarlarkDeprecated.class);
   }
 
   @Override
@@ -61,11 +57,6 @@
   }
 
   @Override
-  public boolean isDeprecated() {
-    return deprecated;
-  }
-
-  @Override
   public String getName() {
     // Normally we refer to methods by their name, e.g. "foo" for method foo(arg1, arg2).
     // However, if a method is overloaded, the name is no longer unique, which forces us to append

diff --git a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkParamDoc.java b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkParamDoc.java
index 4a90b86..48b2132 100644
--- a/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkParamDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/starlark/StarlarkParamDoc.java

@@ -94,10 +94,4 @@
     }
     return prefixWarning + StarlarkDocUtils.substituteVariables(param.doc());
   }
-
-  @Override
-  public boolean isDeprecated() {
-    // TODO(cparsons): Implement for deprecated parameters.
-    return false;
-  }
 }

diff --git a/src/main/java/com/google/devtools/build/docgen/templates/skylark-library.vm b/src/main/java/com/google/devtools/build/docgen/templates/skylark-library.vm
index 96754f1..b7bbd74 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/skylark-library.vm
+++ b/src/main/java/com/google/devtools/build/docgen/templates/skylark-library.vm

@@ -20,9 +20,6 @@
     #if ($method.documented())
     <li>
       <a href="#${method.name}">${method.name}</a>
-      #if (${method.deprecated})
-      (Deprecated)
-      #end
     </li>
     #end
   #end

diff --git a/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm b/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm
index 367754e..db44541 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm
+++ b/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm

@@ -67,11 +67,6 @@
 
       <a href="${module.name}.html">${module.name}</a>
 
-
-    #if (${module.deprecated})
-    (Deprecated)
-    #end
-
     </li>
 
 #end
@@ -95,9 +90,6 @@
 
       <a href="${module.name}.html">${module.title}</a>
 
-      #if (${module.deprecated})
-      (Deprecated)
-      #end
     </li>
 
   #end

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkCommandLineApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkCommandLineApi.java
index 9e14edd..5ebb5c7 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkCommandLineApi.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkCommandLineApi.java

@@ -17,7 +17,6 @@
 import com.google.devtools.build.lib.collect.nestedset.Depset;
 import net.starlark.java.annot.Param;
 import net.starlark.java.annot.StarlarkBuiltin;
-import net.starlark.java.annot.StarlarkDeprecated;
 import net.starlark.java.annot.StarlarkDocumentationCategory;
 import net.starlark.java.annot.StarlarkMethod;
 import net.starlark.java.eval.EvalException;
@@ -28,7 +27,6 @@
     name = "cmd_helper",
     category = StarlarkDocumentationCategory.TOP_LEVEL_TYPE,
     doc = "Deprecated. Module for creating memory efficient command lines.")
-@StarlarkDeprecated
 public interface StarlarkCommandLineApi extends StarlarkValue {
 
   @StarlarkMethod(

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleConfigurationApi.java
index fbaf900..ef5b565 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleConfigurationApi.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleConfigurationApi.java

@@ -16,7 +16,6 @@
 
 import net.starlark.java.annot.Param;
 import net.starlark.java.annot.StarlarkBuiltin;
-import net.starlark.java.annot.StarlarkDeprecated;
 import net.starlark.java.annot.StarlarkDocumentationCategory;
 import net.starlark.java.annot.StarlarkMethod;
 import net.starlark.java.eval.StarlarkValue;
@@ -34,7 +33,6 @@
       doc =
           "<b>Deprecated. Use <a href='#single_arch_cpu'>single_arch_cpu</a> instead.</b> "
               + "The value of ios_cpu for this configuration.")
-  @StarlarkDeprecated
   String getIosCpu();
 
   @StarlarkMethod(

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaStarlarkApiProviderApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaStarlarkApiProviderApi.java
index 21811da..b15943a 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaStarlarkApiProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaStarlarkApiProviderApi.java

@@ -16,7 +16,6 @@
 
 import com.google.devtools.build.lib.starlarkbuildapi.FileApi;
 import net.starlark.java.annot.StarlarkBuiltin;
-import net.starlark.java.annot.StarlarkDeprecated;
 import net.starlark.java.annot.StarlarkDocumentationCategory;
 import net.starlark.java.eval.StarlarkValue;
 
@@ -32,5 +31,4 @@
         "Deprecated. Use <a"
             + " href=\"https://docs.bazel.build/versions/master/skylark/lib/JavaInfo.html\">JavaInfo</a>"
             + " instead.")
-@StarlarkDeprecated
 public interface JavaStarlarkApiProviderApi<FileT extends FileApi> extends StarlarkValue {}

diff --git a/src/main/java/net/starlark/java/annot/Param.java b/src/main/java/net/starlark/java/annot/Param.java
index a709424..06f3f6a 100644
--- a/src/main/java/net/starlark/java/annot/Param.java
+++ b/src/main/java/net/starlark/java/annot/Param.java

@@ -40,14 +40,14 @@
    *
    * <p>If the function implementation needs to distinguish the case where the caller does not
    * supply a value for this parameter, you can set the default to the magic string "unbound", which
-   * maps to the sentinal object {@link com.google.devtools.build.lib.syntax.Starlark#UNBOUND}
-   * (which can't appear in normal Starlark code).
+   * maps to the sentinal object {@link net.starlark.java.eval.Starlark#UNBOUND} (which can't appear
+   * in normal Starlark code).
    */
   String defaultValue() default "";
 
   /**
    * Type of the parameter, e.g. {@link String}.class or {@link
-   * com.google.devtools.build.lib.syntax.Sequence}.class.
+   * net.starlark.java.eval.Sequence}.class.
    */
   Class<?> type() default Object.class;
 
@@ -59,10 +59,9 @@
   ParamType[] allowedTypes() default {};
 
   /**
-   * When {@link #type()} is a generic type (e.g., {@link
-   * com.google.devtools.build.lib.syntax.Sequence}), specify the type parameter (e.g. {@link
-   * String}.class} along with {@link com.google.devtools.build.lib.syntax.Sequence} for {@link
-   * #type()} to specify a list of strings).
+   * When {@link #type()} is a generic type (e.g., {@link net.starlark.java.eval.Sequence}), specify
+   * the type parameter (e.g. {@link String}.class} along with {@link
+   * net.starlark.java.eval.Sequence} for {@link #type()} to specify a list of strings).
    *
    * <p>This is only used for documentation generation. The actual generic type is not checked at
    * runtime, so the Java method signature should use a generic type of Object and cast

diff --git a/src/main/java/net/starlark/java/annot/ParamType.java b/src/main/java/net/starlark/java/annot/ParamType.java
index 777461a..50eb043 100644
--- a/src/main/java/net/starlark/java/annot/ParamType.java
+++ b/src/main/java/net/starlark/java/annot/ParamType.java

@@ -21,15 +21,14 @@
 public @interface ParamType {
   /**
    * The Java class of the type, e.g. {@link String}.class or {@link
-   * com.google.devtools.build.lib.syntax.Sequence}.class.
+   * net.starlark.java.eval.Sequence}.class.
    */
   Class<?> type() default Object.class;
 
   /**
-   * When {@link #type()} is a generic type (e.g., {@link
-   * com.google.devtools.build.lib.syntax.Sequence}), specify the type parameter (e.g. {@link
-   * String}.class} along with {@link com.google.devtools.build.lib.syntax.Sequence} for {@link
-   * #type()} to specify a list of strings).
+   * When {@link #type()} is a generic type (e.g., {@link net.starlark.java.eval.Sequence}), specify
+   * the type parameter (e.g. {@link String}.class} along with {@link
+   * net.starlark.java.eval.Sequence} for {@link #type()} to specify a list of strings).
    *
    * <p>This is only used for documentation generation. The actual generic type is not checked at
    * runtime, so the Java method signature should use a generic type of Object and cast

diff --git a/src/main/java/net/starlark/java/annot/StarlarkDeprecated.java b/src/main/java/net/starlark/java/annot/StarlarkDeprecated.java
deleted file mode 100644
index db1ad69..0000000
--- a/src/main/java/net/starlark/java/annot/StarlarkDeprecated.java
+++ /dev/null

@@ -1,30 +0,0 @@
-// Copyright 2019 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package net.starlark.java.annot;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An annotation to mark a Starlark symbol as "deprecated" for documentation purposes.
- *
- * <p>This annotation should be used only for documentation purposes. This does not necessarily
- * indicate that the annotated java element should be considered deprecated. For example, a method
- * may be deprecated as a Starlark-exposed method, but encouraged from java callsites.
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface StarlarkDeprecated {}