From 1b98de65873054b148ced772cfa827a7bfb5ad9a Mon Sep 17 00:00:00 2001
From: vladmos <vladmos@google.com>
Date: Thu, 12 Oct 2017 17:25:24 +0200
Subject: Remove the deprecated set constructor from Skylark

The `set` constructor used to be deprecated, but it was still possible to use
it by providing --incompatible_disallow_set_constructor=false.

RELNOTES[INC]: The flag --incompatible_disallow_set_constructor is no longer
available, the deprecated `set` constructor is not available anymore.

PiperOrigin-RevId: 171962361
---
 .../build/lib/collect/nestedset/Order.java         | 45 ++++------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/collect/nestedset')

diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
index 05cc7a1b1a..6b6fde0927 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
@@ -102,23 +102,20 @@ import java.util.HashMap;
  * dependencies-after-parent ordering. Note that the latter is usually more important, so please use
  * LINK_ORDER whenever possible.
  */
-// TODO(bazel-team): Remove deprecatedSkylarkName and it's associated helpers before Bazel 1.0.
+// TODO(bazel-team): Remove deprecated names from the documentation above.
 public enum Order {
-  STABLE_ORDER("default", "stable"),
-  COMPILE_ORDER("postorder", "compile"),
-  LINK_ORDER("topological", "link"),
-  NAIVE_LINK_ORDER("preorder", "naive_link");
+  STABLE_ORDER("default"),
+  COMPILE_ORDER("postorder"),
+  LINK_ORDER("topological"),
+  NAIVE_LINK_ORDER("preorder");
 
   private static final ImmutableMap<String, Order> VALUES;
-  private static final ImmutableMap<String, Order> DEPRECATED_VALUES;
 
   private final String skylarkName;
-  private final String deprecatedSkylarkName;
   private final NestedSet<?> emptySet;
 
-  private Order(String skylarkName, String deprecatedSkylarkName) {
+  private Order(String skylarkName) {
     this.skylarkName = skylarkName;
-    this.deprecatedSkylarkName = deprecatedSkylarkName;
     this.emptySet = new NestedSet<>(this);
   }
 
@@ -134,46 +131,21 @@ public enum Order {
     return skylarkName;
   }
 
-  public String getDeprecatedSkylarkName() {
-    return deprecatedSkylarkName;
-  }
-
   /**
    * Parses the given string as a nested set order
    *
    * @param name unique name of the order
-   * @param forbidDeprecatedOrderNames if true, old style ordering names will be rejected
    * @return the appropriate order instance
    * @throws IllegalArgumentException if the name is not valid
    */
-  public static Order parse(String name, boolean forbidDeprecatedOrderNames) {
+  public static Order parse(String name) {
     if (VALUES.containsKey(name)) {
       return VALUES.get(name);
-    } else if (DEPRECATED_VALUES.containsKey(name)) {
-      if (forbidDeprecatedOrderNames) {
-        throw new IllegalArgumentException(String.format(
-            "Order name '%s' is deprecated, use '%s' instead",
-            name,
-            DEPRECATED_VALUES.get(name).getSkylarkName()
-        ));
-      }
-      return DEPRECATED_VALUES.get(name);
     } else {
       throw new IllegalArgumentException("Invalid order: " + name);
     }
   }
 
-  /**
-   * Parses the given string as a nested set order
-   *
-   * @param name unique name of the order
-   * @return the appropriate order instance
-   * @throws IllegalArgumentException if the name is not valid
-   */
-  public static Order parse(String name) {
-    return parse(name, false);
-  }
-
   /**
    * Determines whether two orders are considered compatible.
    *
@@ -191,14 +163,11 @@ public enum Order {
     Order[] tmpValues = Order.values();
 
     HashMap<String, Order> entries = Maps.newHashMapWithExpectedSize(tmpValues.length);
-    HashMap<String, Order> deprecatedEntries = Maps.newHashMapWithExpectedSize(tmpValues.length);
 
     for (Order current : tmpValues) {
       entries.put(current.getSkylarkName(), current);
-      deprecatedEntries.put(current.getDeprecatedSkylarkName(), current);
     }
 
     VALUES = ImmutableMap.copyOf(entries);
-    DEPRECATED_VALUES = ImmutableMap.copyOf(deprecatedEntries);
   }
 }
-- 
cgit v1.2.3