bazel packages: delete EmptyEnvironmentExtension
It appears to be unnecessary.
PiperOrigin-RevId: 275391229
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 90f212a..8cd35a8 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
@@ -1915,25 +1915,6 @@
SkylarkSignatureProcessor.configureSkylarkFunctions(PackageFactory.class);
}
- /** Empty EnvironmentExtension */
- public static class EmptyEnvironmentExtension implements EnvironmentExtension {
- @Override
- public void update(StarlarkThread thread) {}
-
- @Override
- public void updateWorkspace(StarlarkThread thread) {}
-
- @Override
- public Iterable<PackageArgument<?>> getPackageArguments() {
- return ImmutableList.of();
- }
-
- @Override
- public ImmutableList<BaseFunction> nativeModuleFunctions() {
- return ImmutableList.<BaseFunction>of();
- }
- }
-
/**
* checkBuildSyntax checks the syntax tree of a BUILD (not .bzl) file. If it discovers a 'def',
* 'if', or 'for' statement, or a f(*args) or f(**kwargs) call, it reports an event to handler and
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
index e427037..f4dcf86 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
@@ -29,8 +29,6 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.events.NullEventHandler;
-import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
@@ -138,9 +136,6 @@
ruleClassProvider,
analysisMock
.getPackageFactoryBuilderForTesting(directories)
- .setEnvironmentExtensions(
- ImmutableList.<EnvironmentExtension>of(
- new PackageFactory.EmptyEnvironmentExtension()))
.build(ruleClassProvider, fileSystem),
directories,
/*skylarkImportLookupFunctionForInlining=*/ null));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index b42bcb6..5556e96 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -28,8 +28,6 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.events.NullEventHandler;
-import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -139,9 +137,6 @@
ruleClassProvider,
analysisMock
.getPackageFactoryBuilderForTesting(directories)
- .setEnvironmentExtensions(
- ImmutableList.<EnvironmentExtension>of(
- new PackageFactory.EmptyEnvironmentExtension()))
.build(ruleClassProvider, fileSystem),
directories,
/*skylarkImportLookupFunctionForInlining=*/ null));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index 3d85f63..3e5f330 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -33,8 +33,6 @@
import com.google.devtools.build.lib.analysis.util.AnalysisMock;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.events.NullEventHandler;
-import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -198,9 +196,6 @@
ruleClassProvider,
analysisMock
.getPackageFactoryBuilderForTesting(directories)
- .setEnvironmentExtensions(
- ImmutableList.<EnvironmentExtension>of(
- new PackageFactory.EmptyEnvironmentExtension()))
.build(ruleClassProvider, fs),
directories,
/*skylarkImportLookupFunctionForInlining=*/ null));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
index 162f84e..e8eeced 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -27,8 +27,6 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.events.NullEventHandler;
-import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -116,9 +114,6 @@
ruleClassProvider,
analysisMock
.getPackageFactoryBuilderForTesting(directories)
- .setEnvironmentExtensions(
- ImmutableList.<EnvironmentExtension>of(
- new PackageFactory.EmptyEnvironmentExtension()))
.build(ruleClassProvider, fileSystem),
directories,
/*skylarkImportLookupFunctionForInlining=*/ null));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index ec11210..5350d3f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -32,8 +32,6 @@
import com.google.devtools.build.lib.events.NullEventHandler;
import com.google.devtools.build.lib.packages.BuildFileName;
import com.google.devtools.build.lib.packages.BuildFileNotFoundException;
-import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -148,9 +146,6 @@
ruleClassProvider,
analysisMock
.getPackageFactoryBuilderForTesting(directories)
- .setEnvironmentExtensions(
- ImmutableList.<EnvironmentExtension>of(
- new PackageFactory.EmptyEnvironmentExtension()))
.build(ruleClassProvider, fileSystem),
directories,
/*skylarkImportLookupFunctionForInlining=*/ null));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
index 8bf0d8d..e6ef252 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
@@ -31,7 +31,6 @@
import com.google.devtools.build.lib.events.NullEventHandler;
import com.google.devtools.build.lib.packages.NoSuchTargetException;
import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
@@ -149,7 +148,7 @@
@Override
protected Iterable<EnvironmentExtension> getEnvironmentExtensions() {
- return ImmutableList.<EnvironmentExtension>of(new PackageFactory.EmptyEnvironmentExtension());
+ return ImmutableList.of();
}
private Label getLabelMapping(Package pkg, String name) throws NoSuchTargetException {
