bazel packages: rename InfoInterface to Info
Info is now an interface. The logic of the former abstract class of that name
has been pushed down into it subclasses, most of which do not need to materialize
Location and Provider as fields. This saved two words per Info instance.
PiperOrigin-RevId: 284178767
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
index 6f86752..7247db8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.events.ExtendedEventHandler;
import com.google.devtools.build.lib.packages.BuildType;
import com.google.devtools.build.lib.packages.BuiltinProvider;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.NativeProvider;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.TriState;
@@ -92,7 +92,7 @@
* Returns the list of declared providers (native and Skylark) of the specified Skylark key from a
* set of transitive info collections.
*/
- public static <T extends InfoInterface> Iterable<T> getProviders(
+ public static <T extends Info> Iterable<T> getProviders(
Iterable<? extends TransitiveInfoCollection> prerequisites,
final NativeProvider<T> skylarkKey) {
ImmutableList.Builder<T> result = ImmutableList.builder();
@@ -109,7 +109,7 @@
* Returns the list of declared providers (native and Skylark) of the specified Skylark key from a
* set of transitive info collections.
*/
- public static <T extends InfoInterface> Iterable<T> getProviders(
+ public static <T extends Info> Iterable<T> getProviders(
Iterable<? extends TransitiveInfoCollection> prerequisites,
final BuiltinProvider<T> skylarkKey) {
ImmutableList.Builder<T> result = ImmutableList.builder();
@@ -131,14 +131,14 @@
}
/** Returns the iterable of collections that have the specified provider. */
- public static <S extends TransitiveInfoCollection, C extends InfoInterface> Iterable<S>
- filterByProvider(Iterable<S> prerequisites, final NativeProvider<C> provider) {
+ public static <S extends TransitiveInfoCollection, C extends Info> Iterable<S> filterByProvider(
+ Iterable<S> prerequisites, final NativeProvider<C> provider) {
return Iterables.filter(prerequisites, target -> target.get(provider) != null);
}
/** Returns the iterable of collections that have the specified provider. */
- public static <S extends TransitiveInfoCollection, C extends InfoInterface>
- Iterable<S> filterByProvider(Iterable<S> prerequisites, final BuiltinProvider<C> provider) {
+ public static <S extends TransitiveInfoCollection, C extends Info> Iterable<S> filterByProvider(
+ Iterable<S> prerequisites, final BuiltinProvider<C> provider) {
return Iterables.filter(prerequisites, target -> target.get(provider) != null);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index 86dd39e..0e07c6d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -34,7 +34,7 @@
import com.google.devtools.build.lib.packages.AspectClass;
import com.google.devtools.build.lib.packages.AspectDescriptor;
import com.google.devtools.build.lib.packages.AspectParameters;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
@@ -122,7 +122,7 @@
}
}
- public InfoInterface get(Provider.Key key) {
+ public Info get(Provider.Key key) {
return providers.get(key);
}
@@ -233,8 +233,7 @@
return this;
}
- public Builder addSkylarkDeclaredProvider(InfoInterface declaredProvider)
- throws EvalException {
+ public Builder addSkylarkDeclaredProvider(Info declaredProvider) throws EvalException {
Provider constructor = declaredProvider.getProvider();
if (!constructor.isExported()) {
throw new EvalException(
@@ -244,11 +243,11 @@
return this;
}
- private void addDeclaredProvider(InfoInterface declaredProvider) {
+ private void addDeclaredProvider(Info declaredProvider) {
providers.put(declaredProvider);
}
- public Builder addNativeDeclaredProvider(InfoInterface declaredProvider) {
+ public Builder addNativeDeclaredProvider(Info declaredProvider) {
Provider constructor = declaredProvider.getProvider();
Preconditions.checkState(constructor.isExported());
addDeclaredProvider(declaredProvider);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java
index a60fe0d..95dd272 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
import javax.annotation.Nullable;
@@ -33,7 +33,7 @@
@Nullable
@Override
- protected InfoInterface rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
index dced6a4..a0f7e9e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.analysis;
import com.google.devtools.build.lib.packages.BuiltinProvider;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.NativeProvider;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
@@ -46,7 +46,7 @@
* <p>Use {@link #get(NativeProvider)} for native providers.
*/
@Nullable
- InfoInterface get(Provider.Key providerKey);
+ Info get(Provider.Key providerKey);
/**
* Returns the native declared provider requested, or null, if the information is not found.
@@ -54,7 +54,7 @@
* <p>Type-safe version of {@link #get(Provider.Key)} for native providers.
*/
@Nullable
- default <T extends InfoInterface> T get(NativeProvider<T> provider) {
+ default <T extends Info> T get(NativeProvider<T> provider) {
return provider.getValueClass().cast(get(provider.getKey()));
}
@@ -64,7 +64,7 @@
* <p>Type-safe version of {@link #get(Provider.Key)} for native providers.
*/
@Nullable
- default <T extends InfoInterface> T get(BuiltinProvider<T> provider) {
+ default <T extends Info> T get(BuiltinProvider<T> provider) {
return provider.getValueClass().cast(get(provider.getKey()));
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index 8f25598..f3375c3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -51,7 +51,7 @@
import com.google.devtools.build.lib.packages.Attribute;
import com.google.devtools.build.lib.packages.BuildSetting;
import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.TargetUtils;
@@ -498,9 +498,9 @@
* <p>Has special handling for {@link OutputGroupInfo}: that provider is not added from Skylark
* directly, instead its output groups are added.
*
- * <p>Use {@link #addNativeDeclaredProvider(InfoInterface)} in definitions of native rules.
+ * <p>Use {@link #addNativeDeclaredProvider(Info)} in definitions of native rules.
*/
- public RuleConfiguredTargetBuilder addSkylarkDeclaredProvider(InfoInterface provider)
+ public RuleConfiguredTargetBuilder addSkylarkDeclaredProvider(Info provider)
throws EvalException {
Provider constructor = provider.getProvider();
if (!constructor.isExported()) {
@@ -522,10 +522,10 @@
* Adds "declared providers" defined in native code to the rule. Use this method for declared
* providers in definitions of native rules.
*
- * <p>Use {@link #addSkylarkDeclaredProvider(InfoInterface)} for Skylark rule implementations.
+ * <p>Use {@link #addSkylarkDeclaredProvider(Info)} for Skylark rule implementations.
*/
- public RuleConfiguredTargetBuilder addNativeDeclaredProviders(Iterable<InfoInterface> providers) {
- for (InfoInterface provider : providers) {
+ public RuleConfiguredTargetBuilder addNativeDeclaredProviders(Iterable<Info> providers) {
+ for (Info provider : providers) {
addNativeDeclaredProvider(provider);
}
return this;
@@ -535,9 +535,9 @@
* Adds a "declared provider" defined in native code to the rule. Use this method for declared
* providers in definitions of native rules.
*
- * <p>Use {@link #addSkylarkDeclaredProvider(InfoInterface)} for Skylark rule implementations.
+ * <p>Use {@link #addSkylarkDeclaredProvider(Info)} for Skylark rule implementations.
*/
- public RuleConfiguredTargetBuilder addNativeDeclaredProvider(InfoInterface provider) {
+ public RuleConfiguredTargetBuilder addNativeDeclaredProvider(Info provider) {
Provider constructor = provider.getProvider();
Preconditions.checkState(constructor.isExported());
providersBuilder.put(provider);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 614cd11..f167e8a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -79,7 +79,6 @@
import com.google.devtools.build.lib.packages.FilesetEntry;
import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
import com.google.devtools.build.lib.packages.Info;
-import com.google.devtools.build.lib.packages.InfoInterface;
import com.google.devtools.build.lib.packages.InputFile;
import com.google.devtools.build.lib.packages.NativeProvider;
import com.google.devtools.build.lib.packages.OutputFile;
@@ -1073,7 +1072,7 @@
* Returns all the declared providers (native and Skylark) for the specified constructor under the
* specified attribute of this target in the BUILD file.
*/
- public <T extends InfoInterface> Iterable<T> getPrerequisites(
+ public <T extends Info> Iterable<T> getPrerequisites(
String attributeName, Mode mode, final NativeProvider<T> skylarkKey) {
return AnalysisUtils.getProviders(getPrerequisites(attributeName, mode), skylarkKey);
}
@@ -1082,7 +1081,7 @@
* Returns all the declared providers (native and Skylark) for the specified constructor under the
* specified attribute of this target in the BUILD file.
*/
- public <T extends InfoInterface> Iterable<T> getPrerequisites(
+ public <T extends Info> Iterable<T> getPrerequisites(
String attributeName, Mode mode, final BuiltinProvider<T> skylarkKey) {
return AnalysisUtils.getProviders(getPrerequisites(attributeName, mode), skylarkKey);
}
@@ -1093,7 +1092,7 @@
* TransitiveInfoCollection under the specified attribute.
*/
@Nullable
- public <T extends InfoInterface> T getPrerequisite(
+ public <T extends Info> T getPrerequisite(
String attributeName, Mode mode, final NativeProvider<T> skylarkKey) {
TransitiveInfoCollection prerequisite = getPrerequisite(attributeName, mode);
return prerequisite == null ? null : prerequisite.get(skylarkKey);
@@ -1105,7 +1104,7 @@
* TransitiveInfoCollection under the specified attribute.
*/
@Nullable
- public <T extends InfoInterface> T getPrerequisite(
+ public <T extends Info> T getPrerequisite(
String attributeName, Mode mode, final BuiltinProvider<T> skylarkKey) {
TransitiveInfoCollection prerequisite = getPrerequisite(attributeName, mode);
return prerequisite == null ? null : prerequisite.get(skylarkKey);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java
index 91b3249..c1cca86 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.analysis;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import javax.annotation.concurrent.Immutable;
@@ -26,7 +26,7 @@
*
* <ul>
* <li>Declared providers. They are exposed to Skylark and identified by {@link Provider.Key}.
- * Provider instances are {@link InfoInterface}s.
+ * Provider instances are {@link Info}s.
* <li>Native providers. They are identified by their {@link Class} and their instances are
* instances of that class. They should implement {@link TransitiveInfoProvider} marker
* interface.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java
index 3d87e47..b7f6669 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.analysis;
import com.google.common.base.Preconditions;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -49,8 +49,7 @@
Preconditions.checkNotNull(providerClass);
Preconditions.checkNotNull(provider);
Preconditions.checkState(
- !(provider instanceof InfoInterface), "Expose %s as native declared provider",
- providerClass);
+ !(provider instanceof Info), "Expose %s as native declared provider", providerClass);
// TODO(arielb): throw an exception if the providerClass is already present?
// This is enforced by aspects but RuleConfiguredTarget presents violations
@@ -59,7 +58,7 @@
return this;
}
- public TransitiveInfoProviderMapBuilder put(InfoInterface classObject) {
+ public TransitiveInfoProviderMapBuilder put(Info classObject) {
Preconditions.checkNotNull(classObject);
Preconditions.checkState(!(classObject instanceof TransitiveInfoProvider),
"Declared provider %s should not implement TransitiveInfoProvider",
@@ -105,8 +104,8 @@
}
@Nullable
- public InfoInterface getProvider(Provider.Key key) {
- return (InfoInterface) providers.get(key);
+ public Info getProvider(Provider.Key key) {
+ return (Info) providers.get(key);
}
public TransitiveInfoProviderMap build() {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapImpl.java
index 1b5aa39..3ef7f4f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapImpl.java
@@ -16,7 +16,7 @@
import com.google.common.base.Preconditions;
import com.google.devtools.build.lib.collect.ImmutableSharedKeyMap;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
@@ -62,8 +62,8 @@
@Nullable
@Override
- public InfoInterface get(Provider.Key key) {
- return (InfoInterface) super.get(key);
+ public Info get(Provider.Key key) {
+ return (Info) super.get(key);
}
@Nullable
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
index 71330b8..6734c37 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.events.Location;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
@@ -218,7 +218,7 @@
/** Returns a declared provider provided by this target. Only meant to use from Skylark. */
@Nullable
@Override
- public final InfoInterface get(Provider.Key providerKey) {
+ public final Info get(Provider.Key providerKey) {
if (providerKey.equals(DefaultInfo.PROVIDER.getKey())) {
return getDefaultProvider();
}
@@ -227,7 +227,7 @@
/** Implement in subclasses to get a skylark provider for a given {@code providerKey}. */
@Nullable
- protected abstract InfoInterface rawGetSkylarkProvider(Provider.Key providerKey);
+ protected abstract Info rawGetSkylarkProvider(Provider.Key providerKey);
public String getRuleClassString() {
return "";
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
index d83b7cb..b95f126 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
@@ -18,7 +18,7 @@
import com.google.devtools.build.lib.analysis.TargetContext;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
@@ -41,7 +41,7 @@
}
@Override
- protected InfoInterface rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java
index 2dff116..12b5e9e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java
@@ -32,7 +32,7 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
@@ -113,7 +113,7 @@
}
@Override
- protected InfoInterface rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
return providers.get(providerKey);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
index 0fcc28a..ee6eb34 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMap;
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMapBuilder;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.Provider.Key;
import com.google.devtools.build.lib.skylarkbuildapi.ActionApi;
@@ -95,8 +95,8 @@
}
@Override
- protected InfoInterface rawGetSkylarkProvider(Provider.Key providerKey) {
- InfoInterface provider = providers.get(providerKey);
+ protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ Info provider = providers.get(providerKey);
if (provider == null) {
provider = base.get(providerKey);
}
@@ -181,7 +181,7 @@
if (base.get(key) != null || aspectProviders.contains(key)) {
throw new DuplicateException("Provider " + key + " provided twice");
}
- aspectProviders.put((InfoInterface) providers.getProviderInstanceAt(i));
+ aspectProviders.put((Info) providers.getProviderInstanceAt(i));
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java
index 6b30c77..76ae3c0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.PackageGroup;
import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
import com.google.devtools.build.lib.packages.Provider;
@@ -107,7 +107,7 @@
}
@Override
- protected InfoInterface rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
index 86d8f9b..fea75c1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
@@ -38,7 +38,7 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.OutputFile;
import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
import com.google.devtools.build.lib.packages.Provider;
@@ -215,7 +215,7 @@
}
@Override
- protected InfoInterface rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
return providers.get(providerKey);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
index 242073c..c61fd98 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
@@ -38,7 +38,7 @@
import com.google.devtools.build.lib.packages.AdvertisedProviderSet;
import com.google.devtools.build.lib.packages.BazelStarlarkContext;
import com.google.devtools.build.lib.packages.FunctionSplitTransitionWhitelist;
-import com.google.devtools.build.lib.packages.InfoInterface;
+import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.packages.NativeProvider;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.Rule;
@@ -138,7 +138,7 @@
if (ruleContext.hasErrors()) {
return null;
- } else if (!(target instanceof InfoInterface)
+ } else if (!(target instanceof Info)
&& target != Starlark.NONE
&& !(target instanceof Iterable)) {
ruleContext.ruleError(
@@ -325,11 +325,11 @@
throws EvalException {
StructImpl oldStyleProviders = StructProvider.STRUCT.createEmpty(loc);
- Map<Provider.Key, InfoInterface> declaredProviders = new LinkedHashMap<>();
+ Map<Provider.Key, Info> declaredProviders = new LinkedHashMap<>();
- if (target instanceof InfoInterface) {
+ if (target instanceof Info) {
// Either an old-style struct or a single declared provider (not in a list)
- InfoInterface info = (InfoInterface) target;
+ Info info = (Info) target;
// Use the creation location of this struct as a better reference in error messages
loc = info.getCreationLoc();
if (getProviderKey(loc, info).equals(StructProvider.STRUCT.getKey())) {
@@ -350,10 +350,10 @@
if (struct.hasField("providers")) {
Iterable<?> iterable = cast("providers", struct, Iterable.class, loc);
for (Object o : iterable) {
- InfoInterface declaredProvider =
+ Info declaredProvider =
SkylarkType.cast(
o,
- InfoInterface.class,
+ Info.class,
loc,
"The value of 'providers' should be a sequence of declared providers");
Provider.Key providerKey = getProviderKey(loc, declaredProvider);
@@ -372,10 +372,10 @@
} else if (target instanceof Iterable) {
// Sequence of declared providers
for (Object o : (Iterable) target) {
- InfoInterface declaredProvider =
+ Info declaredProvider =
SkylarkType.cast(
o,
- InfoInterface.class,
+ Info.class,
loc,
"A return value of a rule implementation function should be "
+ "a sequence of declared providers");
@@ -390,7 +390,7 @@
boolean defaultProviderProvidedExplicitly = false;
- for (InfoInterface declaredProvider : declaredProviders.values()) {
+ for (Info declaredProvider : declaredProviders.values()) {
if (getProviderKey(loc, declaredProvider).equals(DefaultInfo.PROVIDER.getKey())) {
parseDefaultProviderFields((DefaultInfo) declaredProvider, context, builder);
defaultProviderProvidedExplicitly = true;
@@ -436,8 +436,8 @@
throws EvalException {
builder.addSkylarkTransitiveInfo(fieldName, value);
- if (value instanceof InfoInterface) {
- InfoInterface info = (InfoInterface) value;
+ if (value instanceof Info) {
+ Info info = (Info) value;
// To facilitate migration off legacy provider syntax, implicitly set the modern provider key
// and the canonical legacy provider key if applicable.
@@ -460,7 +460,7 @@
RuleConfiguredTargetBuilder builder,
StructImpl oldStyleProviders,
String fieldName,
- InfoInterface info)
+ Info info)
throws EvalException {
// If the modern key is already set, do nothing.
if (builder.containsProviderKey(info.getProvider().getKey())) {
@@ -495,8 +495,7 @@
* occur if the provider was declared in a non-global scope (for example a rule implementation
* function)
*/
- private static Provider.Key getProviderKey(Location loc, InfoInterface infoObject)
- throws EvalException {
+ private static Provider.Key getProviderKey(Location loc, Info infoObject) throws EvalException {
if (!infoObject.getProvider().isExported()) {
throw new EvalException(
loc,
@@ -676,7 +675,7 @@
}
if (ruleContext.getRule().getRuleClassObject().isSkylarkTestable()) {
- InfoInterface actions =
+ Info actions =
ActionsProvider.create(ruleContext.getAnalysisEnvironment().getRegisteredActions());
builder.addSkylarkDeclaredProvider(actions);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java
index ba4d2d8..1d8477d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java
@@ -15,7 +15,6 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.BuiltinProvider;
import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.skylarkbuildapi.test.AnalysisFailureInfoApi;
@@ -26,8 +25,7 @@
*
* <p>Encapsulates information about analysis-phase errors which would have occurred during a build.
*/
-public final class AnalysisFailureInfo extends Info
- implements AnalysisFailureInfoApi<AnalysisFailure> {
+public final class AnalysisFailureInfo implements Info, AnalysisFailureInfoApi<AnalysisFailure> {
/**
* Singleton provider instance for {@link AnalysisFailureInfo}.
@@ -38,10 +36,14 @@
private final NestedSet<AnalysisFailure> causes;
private AnalysisFailureInfo(NestedSet<AnalysisFailure> causes) {
- super(SKYLARK_CONSTRUCTOR, Location.BUILTIN);
this.causes = causes;
}
+ @Override
+ public AnalysisFailureInfoProvider getProvider() {
+ return SKYLARK_CONSTRUCTOR;
+ }
+
/**
* Constructs and returns an {@link AnalysisFailureInfo} object representing the given failures.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java
index 9e7c72a..f485d48 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java
@@ -14,16 +14,15 @@
package com.google.devtools.build.lib.analysis.test;
-import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.BuiltinProvider;
import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.skylarkbuildapi.test.AnalysisTestResultInfoApi;
/**
- * Encapsulates the result of analyis-phase testing. Build targets which return an instance of
- * this provider signal to the build system that it should generate 'stub' test executable.
+ * Encapsulates the result of analyis-phase testing. Build targets which return an instance of this
+ * provider signal to the build system that it should generate 'stub' test executable.
*/
-public class AnalysisTestResultInfo extends Info implements AnalysisTestResultInfoApi {
+public class AnalysisTestResultInfo implements Info, AnalysisTestResultInfoApi {
/**
* Singleton provider instance for {@link AnalysisTestResultInfo}.
@@ -35,12 +34,16 @@
private final String message;
public AnalysisTestResultInfo(Boolean success, String message) {
- super(SKYLARK_CONSTRUCTOR, Location.BUILTIN);
this.success = success;
this.message = message;
}
@Override
+ public TestResultInfoProvider getProvider() {
+ return SKYLARK_CONSTRUCTOR;
+ }
+
+ @Override
public Boolean getSuccess() {
return success;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java
index 95c1fdb..1f3678b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java
@@ -17,7 +17,6 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.BuiltinProvider;
import com.google.devtools.build.lib.packages.Info;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
@@ -26,7 +25,7 @@
/** An implementation class for the InstrumentedFilesProvider interface. */
@AutoCodec
-public final class InstrumentedFilesInfo extends Info implements InstrumentedFilesInfoApi {
+public final class InstrumentedFilesInfo implements Info, InstrumentedFilesInfoApi {
/** Singleton provider instance for {@link InstrumentedFilesInfo}. */
public static final InstrumentedFilesProvider SKYLARK_CONSTRUCTOR =
new InstrumentedFilesProvider();
@@ -57,7 +56,6 @@
NestedSet<Artifact> coverageSupportFiles,
NestedSet<Pair<String, String>> coverageEnvironment,
NestedSet<Pair<String, String>> reportedToActualSources) {
- super(SKYLARK_CONSTRUCTOR, Location.BUILTIN);
this.instrumentedFiles = instrumentedFiles;
this.instrumentationMetadataFiles = instrumentationMetadataFiles;
this.baselineCoverageFiles = baselineCoverageFiles;
@@ -67,6 +65,11 @@
this.reportedToActualSources = reportedToActualSources;
}
+ @Override
+ public InstrumentedFilesProvider getProvider() {
+ return SKYLARK_CONSTRUCTOR;
+ }
+
/** The transitive closure of instrumented source files. */
public NestedSet<Artifact> getInstrumentedFiles() {
return instrumentedFiles;
