Open source SkyframeLabelVisitorTest.

--
MOS_MIGRATED_REVID=106961863

2 files changed, 19 insertions, 19 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 3b20a1327e..d62fe12a03 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -1458,4 +1458,22 @@ public final class PackageFactory {
   static {
     SkylarkSignatureProcessor.configureSkylarkFunctions(PackageFactory.class);
   }
+
+  public static class EmptyEnvironmentExtension implements EnvironmentExtension {
+    @Override
+    public void update(Environment environment) {}
+
+    @Override
+    public void updateWorkspace(Environment environment) {}
+
+    @Override
+    public Iterable<PackageArgument<?>> getPackageArguments() {
+      return ImmutableList.of();
+    }
+
+    @Override
+    public ImmutableList<BaseFunction> nativeModuleFunctions() {
+      return ImmutableList.<BaseFunction>of();
+    }
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
index a1708668fa..9f661bec71 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
@@ -30,7 +30,6 @@ import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.exec.OutputService;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
 import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageArgument;
 import com.google.devtools.build.lib.packages.Preprocessor;
 import com.google.devtools.build.lib.query2.engine.QueryEnvironment.QueryFunction;
 import com.google.devtools.build.lib.query2.output.OutputFormatter;
@@ -40,8 +39,6 @@ import com.google.devtools.build.lib.skyframe.PrecomputedValue.Injected;
 import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutorFactory;
-import com.google.devtools.build.lib.syntax.BaseFunction;
-import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.util.AbruptExitException;
 import com.google.devtools.build.lib.util.Clock;
 import com.google.devtools.build.lib.vfs.FileSystem;
@@ -368,22 +365,7 @@ public abstract class BlazeModule {
    * Returns the extensions this module contributes to the global namespace of the BUILD language.
    */
   public PackageFactory.EnvironmentExtension getPackageEnvironmentExtension() {
-    return new PackageFactory.EnvironmentExtension() {
-      @Override
-      public void update(Environment environment) {}
-
-      @Override
-      public void updateWorkspace(Environment environment) {}
-      @Override
-      public Iterable<PackageArgument<?>> getPackageArguments() {
-        return ImmutableList.of();
-      }
-
-      @Override
-      public ImmutableList<BaseFunction> nativeModuleFunctions() {
-        return ImmutableList.<BaseFunction>of();
-      }
-    };
+    return new PackageFactory.EmptyEnvironmentExtension();
   }
 
   /**