The Order enum now supports the conversion of its values to and from strings.

This functionality used to be part of SkylarkNestedSet.

--
MOS_MIGRATED_REVID=95526136

2 files changed, 1 insertions, 33 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index 3468566e79..74206b4e43 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -368,7 +368,7 @@ public abstract class EvalUtils {
       printList(set, "[", ", ", "]", null, buffer);
       Order order = set.getOrder();
       if (order != Order.STABLE_ORDER) {
-        buffer.append(", order = \"" + SkylarkNestedSet.orderString(order) + "\"");
+        buffer.append(", order = \"" + order.getName() + "\"");
       }
       buffer.append(")");
 
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
index cd2f0ab5c3..8637597c29 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
@@ -215,38 +215,6 @@ public final class SkylarkNestedSet implements Iterable<Object> {
     return EvalUtils.prettyPrintValue(this);
   }
 
-  /**
-   * Parse the string as a set order.
-   */
-  public static Order parseOrder(String s, Location loc) throws EvalException {
-    // Keep in sync with orderString
-    if (s == null || s.equals("stable")) {
-      return Order.STABLE_ORDER;
-    } else if (s.equals("compile")) {
-      return Order.COMPILE_ORDER;
-    } else if (s.equals("link")) {
-      return Order.LINK_ORDER;
-    } else if (s.equals("naive_link")) {
-      return Order.NAIVE_LINK_ORDER;
-    } else {
-      throw new EvalException(loc, "Invalid order: " + s);
-    }
-  }
-
-  /**
-   * Get the order as a string.
-   */
-  public static String orderString(Order order) {
-    // Keep in sync with parseOrder
-    switch (order) {
-      case STABLE_ORDER: return "stable";
-      case COMPILE_ORDER: return "compile";
-      case LINK_ORDER: return "link";
-      case NAIVE_LINK_ORDER: return "naive_link";
-      default: throw new IllegalStateException("unknown order: " + order);
-    }
-  }
-
   public Order getOrder() {
     return set.getOrder();
   }