diff options
Diffstat (limited to 'src/main')
19 files changed, 21 insertions, 21 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index 554ea6ae21..3cda14c0f8 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java @@ -214,7 +214,7 @@ public final class ConfiguredTargetFactory { BuildConfigurationValue.key( fromConfig.fragmentClasses(), BuildOptions.diffForReconstruction( - defaultBuildOptions, ownerTransition.apply(fromConfig.getOptions()))), + defaultBuildOptions, ownerTransition.patch(fromConfig.getOptions()))), InvalidConfigurationException.class); return ownerConfig == null ? null : ownerConfig.getConfiguration(); } catch (InvalidConfigurationException e) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java index 6f1a90fd6d..dd34f19c09 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java @@ -843,7 +843,7 @@ public abstract class DependencyResolver { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { return toOptions; } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java index 862bdbeade..677c028303 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java @@ -427,7 +427,7 @@ public final class ConfigurationResolver { List<BuildOptions> result; if (transition instanceof PatchTransition) { // TODO(bazel-team): safety-check that this never mutates fromOptions. - result = ImmutableList.of(((PatchTransition) transition).apply(fromOptions)); + result = ImmutableList.of(((PatchTransition) transition).patch(fromOptions)); } else if (transition instanceof SplitTransition) { List<BuildOptions> toOptions = ((SplitTransition) transition).split(fromOptions); if (toOptions.isEmpty()) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java index b62ce78bc4..3fef8a2d73 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java @@ -29,7 +29,7 @@ public final class HostTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { if (options.get(BuildConfiguration.Options.class).isHost) { // If the input already comes from the host configuration, just return the existing values. // diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java index 635cab4b47..1fec601858 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java @@ -49,7 +49,7 @@ public class ComposingPatchTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { return Iterables.getOnlyElement(delegate.split(options)); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java index 70c3bf8e70..69970c21c1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java @@ -118,7 +118,7 @@ public class ComposingSplitTransition implements SplitTransition { // TODO(gregce): move this somewhere more general. This isn't intrinsic to composed splits. static List<BuildOptions> apply(BuildOptions fromOptions, ConfigurationTransition transition) { if (transition instanceof PatchTransition) { - return ImmutableList.<BuildOptions>of(((PatchTransition) transition).apply(fromOptions)); + return ImmutableList.<BuildOptions>of(((PatchTransition) transition).patch(fromOptions)); } else if (transition instanceof SplitTransition) { SplitTransition split = (SplitTransition) transition; List<BuildOptions> splitOptions = split.split(fromOptions); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java index 793edafd3e..a05f6b5414 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java @@ -24,7 +24,7 @@ public final class NoTransition implements PatchTransition { private NoTransition() {} @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { return options; } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java index 0d7156b51e..a26d660d13 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java @@ -25,7 +25,7 @@ public class NullTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { throw new UnsupportedOperationException( "This is only referenced in a few places, so it's easier and more efficient to optimize " + "Blaze's transition logic in the presence of null transitions vs. actually call this " diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java index 451148ee60..1fdfa95fd3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java @@ -33,7 +33,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; * private MyTransition() {} * * {@literal @}Override - * public BuildOptions apply(BuildOptions options) { + * public BuildOptions patch(BuildOptions options) { * BuildOptions toOptions = options.clone(); * // Change some setting on toOptions * return toOptions; @@ -57,5 +57,5 @@ public interface PatchTransition extends ConfigurationTransition { * MODIFY THIS VARIABLE WITHOUT CLONING IT FIRST. * @return the options representing the desired post-transition configuration */ - BuildOptions apply(BuildOptions options); + BuildOptions patch(BuildOptions options); } diff --git a/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java index dd7922a722..7d906acd63 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java +++ b/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java @@ -159,7 +159,7 @@ public class TransitionsOutputFormatterCallback extends CqueryThreadsafeCallback if (transition instanceof SplitTransition) { toOptions = ((SplitTransition) transition).split(fromOptions); } else if (transition instanceof PatchTransition) { - toOptions = Collections.singletonList(((PatchTransition) transition).apply(fromOptions)); + toOptions = Collections.singletonList(((PatchTransition) transition).patch(fromOptions)); } else { throw new IllegalStateException( "If this error is thrown, cquery needs to be updated to take into account non-Patch" diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTaggedTrimmingTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTaggedTrimmingTransitionFactory.java index 04806e5fcc..7de11e7ee8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTaggedTrimmingTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTaggedTrimmingTransitionFactory.java @@ -46,7 +46,7 @@ public class ConfigFeatureFlagTaggedTrimmingTransitionFactory implements RuleTra } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { if (!(options.contains(ConfigFeatureFlagOptions.class) && options.get(ConfigFeatureFlagOptions.class) .enforceTransitiveConfigsForConfigFeatureFlag diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactory.java index 28fbf5aecb..9595b0723d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactory.java @@ -55,7 +55,7 @@ public class ConfigFeatureFlagTransitionFactory implements RuleTransitionFactory } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { if (!options.contains(ConfigFeatureFlagOptions.class)) { return options; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java index a13f31991c..3fe0e9d0e5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java @@ -40,7 +40,7 @@ public class ContextCollectorOwnerTransition implements PatchTransition { new ContextCollectorOwnerTransition(); @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { // If this target and its transitive closure don't have C++ options, there's no context // collector configuration to change. if (!options.contains(CppOptions.class)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java index 111207eb42..a69611d9e8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java @@ -32,7 +32,7 @@ public final class DisableLipoTransition implements PatchTransition { private DisableLipoTransition() {} @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { // If this target and its transitive closure don't have C++ options, there's no // LIPO context to change. if (!options.contains(CppOptions.class)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java index 883d59cd34..cdd92b9954 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java @@ -50,7 +50,7 @@ public class EnableLipoTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { CppOptions cppOptions = options.get(CppOptions.class); if (!cppOptions.isDataConfigurationForLipoOptimization() || !ruleLabel.equals(cppOptions.getLipoContextForBuild())) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java index 138b45ce47..231dcca181 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java @@ -32,7 +32,7 @@ public class LipoContextCollectorTransition implements PatchTransition { private LipoContextCollectorTransition() {} @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { // If this target and its transitive closure don't have C++ options, there's no // LIPO context to change. if (!options.contains(CppOptions.class)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java index 3358fd39a8..2481612b43 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java @@ -36,7 +36,7 @@ public class AppleCrosstoolTransition implements PatchTransition { public static final PatchTransition APPLE_CROSSTOOL_TRANSITION = new AppleCrosstoolTransition(); @Override - public BuildOptions apply(BuildOptions buildOptions) { + public BuildOptions patch(BuildOptions buildOptions) { BuildOptions result = buildOptions.clone(); if (!appleCrosstoolTransitionIsAppliedForAllObjc(buildOptions)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonVersionTransition.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonVersionTransition.java index 01ce26ab5d..04419ef2a9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonVersionTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonVersionTransition.java @@ -35,7 +35,7 @@ public class PythonVersionTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { PythonOptions pyOptions = options.get(PythonOptions.class); // The current Python version is either explicitly set by --force_python or a // build-wide default. diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 34286bde16..c424bd44a3 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -1220,12 +1220,12 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { ConfigurationTransition dataTransition = ((ConfiguredRuleClassProvider) ruleClassProvider).getLipoDataTransition(); BuildOptions dataOptions = dataTransition != NoTransition.INSTANCE - ? ((PatchTransition) dataTransition).apply(firstTargetConfig.getOptions()) + ? ((PatchTransition) dataTransition).patch(firstTargetConfig.getOptions()) : firstTargetConfig.getOptions(); BuildOptions hostOptions = dataOptions.get(BuildConfiguration.Options.class).useDistinctHostConfiguration - ? HostTransition.INSTANCE.apply(dataOptions) + ? HostTransition.INSTANCE.patch(dataOptions) : dataOptions; BuildConfiguration hostConfig = getConfiguration(eventHandler, hostOptions, keepGoing); |