refactor: mv LocationExpander.Options to Expander

Change-Id: I4bcc7c0024646b7d4372464f5290375d41702429
PiperOrigin-RevId: 177150713

3 files changed, 11 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Expander.java b/src/main/java/com/google/devtools/build/lib/analysis/Expander.java
index 9dc224a29c..60aa6935b5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Expander.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Expander.java
@@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.LocationExpander.Options;
 import com.google.devtools.build.lib.analysis.stringtemplate.ExpansionException;
 import com.google.devtools.build.lib.analysis.stringtemplate.TemplateContext;
 import com.google.devtools.build.lib.analysis.stringtemplate.TemplateExpander;
@@ -38,6 +37,14 @@ public final class Expander {
     NO
   }
 
+  /** List of options to tweak the LocationExpander. */
+  public static enum Options {
+    /** output the execPath instead of the relative path */
+    EXEC_PATHS,
+    /** Allow to take label from the data attribute */
+    ALLOW_DATA,
+  }
+
   private final RuleContext ruleContext;
   private final TemplateContext templateContext;
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
index 78a511e948..01b97a6a0c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
@@ -60,16 +60,6 @@ import javax.annotation.Nullable;
  */
 public final class LocationExpander {
 
-  /**
-   * List of options to tweak the LocationExpander.
-   */
-  public static enum Options {
-    /** output the execPath instead of the relative path */
-    EXEC_PATHS,
-    /** Allow to take label from the data attribute */
-    ALLOW_DATA,
-  }
-
   private static final boolean EXACTLY_ONE = false;
   private static final boolean ALLOW_MULTIPLE = true;
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LocationTemplateContext.java b/src/main/java/com/google/devtools/build/lib/analysis/LocationTemplateContext.java
index 96bb24ffe8..8817f42f72 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LocationTemplateContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LocationTemplateContext.java
@@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.LocationExpander.Options;
+import com.google.devtools.build.lib.analysis.Expander.Options;
 import com.google.devtools.build.lib.analysis.stringtemplate.ExpansionException;
 import com.google.devtools.build.lib.analysis.stringtemplate.TemplateContext;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -78,12 +78,12 @@ final class LocationTemplateContext implements TemplateContext {
       TemplateContext delegate,
       RuleContext ruleContext,
       @Nullable ImmutableMap<Label, ImmutableCollection<Artifact>> labelMap,
-      LocationExpander.Options... options) {
+      Options... options) {
     this(delegate, ruleContext, labelMap, ImmutableSet.copyOf(options));
   }
 
   public LocationTemplateContext(
-      TemplateContext delegate, RuleContext ruleContext, LocationExpander.Options... options) {
+      TemplateContext delegate, RuleContext ruleContext, Options... options) {
     this(delegate, ruleContext, null, ImmutableSet.copyOf(options));
   }