8000 Remove `@InlineMe`-annotated getters after unknown commit · coderabbit-test/bazel@d99595f · GitHub
[go: up one dir, main page]
Skip to content

Commit d99595f

Browse files
cushoncopybara-github
cushon
authored and
copybara-github
committed
Remove @InlineMe-annotated getters after unknown commit
PiperOrigin-RevId: 696985671 Change-Id: I2bd694ed13abb99e018ce35c2455e002e6fcb3c3
1 parent 366c4ba commit d99595f

File tree

173 files changed

+767
-1657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+767
-1657
lines changed

‎src/main/java/com/google/devtools/build/lib/actions/FilesetOutputSymlink.java

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
2121
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
2222
import com.google.devtools.build.lib.vfs.PathFragment;
23-
import com.google.errorprone.annotations.InlineMe;
2423
import javax.annotation.Nullable;
2524

2625
/**
@@ -59,52 +58,25 @@ public record FilesetOutputSymlink(
5958
requireNonNull(metadata, "metadata");
6059
}
6160

62-
@InlineMe(replacement = "this.name()")
63-
public PathFragment getName() {
64-
return name();
65-
}
66-
67-
@InlineMe(replacement = "this.targetPath()")
68-
public PathFragment getTargetPath() {
69-
return targetPath();
70-
}
71-
72-
@InlineMe(replacement = "this.metadata()")
73-
public HasDigest getMetadata() {
74-
return metadata();
75-
}
76-
77-
@InlineMe(replacement = "this.relativeToExecRoot()")
78-
public boolean isRelativeToExecRoot() {
79-
return relativeToExecRoot();
80-
}
81-
82-
@InlineMe(replacement = "this.enclosingTreeArtifactExecPath()")
83-
@Nullable
84-
public PathFragment getEnclosingTreeArtifactExecPath() {
85-
return enclosingTreeArtifactExecPath();
86-
}
87-
8861
/**
8962
* Reconstitutes the original target path of this symlink.
9063
*
9164
* <p>This method essentially performs the inverse of what is done in {@link #create}. If the
9265
* execution root was stripped originally, it is re-prepended.
9366
*/
9467
public final PathFragment reconstituteTargetPath(PathFragment execRoot) {
95-
return isRelativeToExecRoot() ? execRoot.getRelative(getTargetPath()) : getTargetPath();
68+
return relativeToExecRoot() ? execRoot.getRelative(targetPath()) : targetPath();
9669
}
9770

9871
@Override
9972
public final String toString() {
100-
if (getMetadata() == HasDigest.EMPTY) {
73+
if (metadata() == HasDigest.EMPTY) {
10174
return String.format(
102-
"FilesetOutputSymlink(%s -> %s)",
103-
getName().getPathString(), getTargetPath().getPathString());
75+
"FilesetOutputSymlink(%s -> %s)", name().getPathString(), targetPath().getPathString());
10476
} else {
10577
return String.format(
10678
"FilesetOutputSymlink(%s -> %s | metadataHash=%s)",
107-
getName().getPathString(), getTargetPath().getPathString(), getMetadata());
79+
name().getPathString(), targetPath().getPathString(), metadata());
10880
}
10981
}
11082

‎src/main/java/com/google/devtools/build/lib/actions/FilesetOutputTree.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ public <E1 extends Exception, E2 extends Exception> void visitSymlinks(
111111
for (FilesetOutputSymlink symlink : symlinks) {
112112
if (!isRelativeSymlink(symlink)) {
113113
visitor.acceptSymlink(
114-
symlink.getName(),
115-
symlink.getTargetPath(),
116-
symlink.getMetadata() instanceof FileArtifactValue metadata ? metadata : null);
114+
symlink.name(),
115+
symlink.targetPath(),
116+
symlink.metadata() instanceof FileArtifactValue metadata ? metadata : null);
117117
}
118118
}
119119
return;
@@ -127,14 +127,14 @@ public <E1 extends Exception, E2 extends Exception> void visitSymlinks(
127127
Map<String, FileArtifactValue> artifactValues = new HashMap<>();
128128

129129
for (FilesetOutputSymlink outputSymlink : symlinks) {
130-
PathFragment name = outputSymlink.getName();
131-
String targetPath = outputSymlink.getTargetPath().getPathString();
130+
PathFragment name = outputSymlink.name();
131+
String targetPath = outputSymlink.targetPath().getPathString();
132132
var map = isRelativeSymlink(outputSymlink) ? relativeLinks : resolvedLinks;
133133

134134
// Symlinks are already deduplicated by name in SkyframeFilesetManifestAction.
135135
checkState(map.put(name, targetPath) == null, "Duplicate fileset entry at %s", name);
136136

137-
if (outputSymlink.getMetadata() instanceof FileArtifactValue metadata) {
137+
if (outputSymlink.metadata() instanceof FileArtifactValue metadata) {
138138
artifactValues.put(targetPath, metadata);
139139
}
140140
}
@@ -218,7 +218,7 @@ public enum RelativeSymlinkBehaviorWithoutError {
218218
}
219219

220220
private static boolean isRelativeSymlink(FilesetOutputSymlink symlink) {
221-
return !symlink.getTargetPath().isAbsolute() && !symlink.isRelativeToExecRoot();
221+
return !symlink.targetPath().isAbsolute() && !symlink.relativeToExecRoot();
222222
}
223223

224224
/** Fully resolves relative symlinks, including internal directory symlinks. */
@@ -320,7 +320,7 @@ public static final class ForbiddenRelativeSymlinkException
320320
private ForbiddenRelativeSymlinkException(FilesetOutputSymlink relativeLink) {
321321
super(
322322
"Fileset symlink %s -> %s is not absolute"
323-
.formatted(relativeLink.getName(), relativeLink.getTargetPath()));
323+
.formatted(relativeLink.name(), relativeLink.targetPath()));
324324
}
325325
}
326326
}

‎src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.devtools.build.lib.skyframe.AspectKeyCreator.AspectKey;
2525
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
2626
import com.google.errorprone.annotations.CanIgnoreReturnValue;
27-
import com.google.errorprone.annotations.InlineMe;
2827
import java.util.ArrayList;
2928
import java.util.HashMap;
3029
import java.util.LinkedHashMap;
@@ -210,16 +209,6 @@ public record AspectDeps(AspectDescriptor aspect, ImmutableList<AspectDeps> used
210209
requireNonNull(usedAspects, "usedAspects");
211210
}
212211

213-
@InlineMe(replacement = "this.aspect()")
214-
public AspectDescriptor getAspect() {
215-
return aspect();
216-
}
217-
218-
@InlineMe(replacement = "this.usedAspects()")
219-
public ImmutableList<AspectDeps> getUsedAspects() {
220-
return usedAspects();
221-
}
222-
223212
private static AspectDeps create(
224213
AspectDescriptor aspect, ImmutableList<AspectDeps> usedAspects) {
225214
return new AspectDeps(aspect, usedAspects);
@@ -242,13 +231,13 @@ public static AspectKey buildAspectKey(
242231
AspectDeps aspectDeps,
243232
Map<AspectDescriptor, AspectKey> visited,
244233
ConfiguredTargetKey baseKey) {
245-
AspectDescriptor aspect = aspectDeps.getAspect();
234+
AspectDescriptor aspect = aspectDeps.aspect();
246235
AspectKey aspectKey = visited.get(aspect);
247236
if (aspectKey != null) {
248237
return aspectKey;
249238
}
250239

251-
ImmutableList<AspectDeps> usedAspects = aspectDeps.getUsedAspects();
240+
ImmutableList<AspectDeps> usedAspects = aspectDeps.usedAspects();
252241
var usedAspectKeys = ImmutableList.<AspectKey>builderWithExpectedSize(usedAspects.size());
253242
for (AspectCollection.AspectDeps usedAspect : usedAspects) {
254243
usedAspectKeys.add(buildAspectKey(usedAspect, visited, baseKey));

‎src/main/java/com/google/devtools/build/lib/analysis/AspectContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public final class AspectContext extends RuleContext {
9393
/** Returns the labels of default the toolchain types that aspects have propagated. */
9494
public ImmutableSet<Label> getRequestedToolchainTypesLabels() {
9595
if (targetUsesAutoExecGroups) {
96-
return baseTargetToolchainContexts.getContextMap().entrySet().stream()
96+
return baseTargetToolchainContexts.contextMap().entrySet().stream()
9797
.filter(e -> isAutomaticExecGroup(e.getKey()))
9898
.flatMap(e -> e.getValue().requestedToolchainTypeLabels().keySet().stream())
9999
.collect(toImmutableSet());
@@ -115,7 +115,7 @@ public AspectBaseTargetResolvedToolchainContext.ToolchainAspectsProviders getToo
115115
var execGroupContext = baseTargetToolchainContexts.getDefaultToolchainContext();
116116
if (targetUsesAutoExecGroups) {
117117
execGroupContext =
118-
baseTargetToolchainContexts.getContextMap().entrySet().stream()
118+
baseTargetToolchainContexts.contextMap().entrySet().stream()
119119
.filter(
120120
e ->
121121
isAutomaticExecGroup(e.getKey())

‎src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public RepositoryMapping getMainRepoMapping() throws InterruptedException {
380380
// analysis phase.
381381
throw new MissingDepException("Restart due to missing main repository mapping");
382382
}
383-
return mainRepoMapping.getRepositoryMapping();
383+
return mainRepoMapping.repositoryMapping();
384384
}
385385

386386
@Override

‎src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static ImmutableList<TemplateVariableInfo> getRuleTemplateVariableProvid
5555
if (ruleContext.getToolchainContexts() != null) {
5656
ruleContext
5757
.getToolchainContexts()
58-
.getContextMap()
58+
.contextMap()
5959
.values()
6060
.forEach(context -> providers.addAll(context.templateVariableProviders()));
6161
}

‎src/main/java/com/google/devtools/build/lib/analysis/DependencyResolutionHelpers.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,7 @@ private static void addToolchainDeps(
335335
ToolchainCollection<ToolchainContext> toolchainContexts,
336336
OrderedSetMultimap<DependencyKind, Label> outgoingLabels) {
337337
if (toolchainContexts != null) {
338-
for (Map.Entry<String, ToolchainContext> entry :
339-
toolchainContexts.getContextMap().entrySet()) {
338+
for (Map.Entry<String, ToolchainContext> entry : toolchainContexts.contextMap().entrySet()) {
340339
outgoingLabels.putAll(
341340
DependencyKind.forExecGroup(entry.getKey()),
342341
entry.getValue().resolvedToolchainLabels());
@@ -351,7 +350,7 @@ private static void addBaseTargetToolchainDeps(
351350
return;
352351
}
353352
for (Map.Entry<String, UnloadedToolchainContext> execGroup :
354-
toolchainContexts.getContextMap().entrySet()) {
353+
toolchainContexts.contextMap().entrySet()) {
355354
for (var toolchainTypeToResolved :
356355
execGroup.getValue().toolchainTypeToResolved().asMap().entrySet()) {
357356
// map entries from (exec group, toolchain type) to resolved toolchain labels. We need to

‎src/main/java/com/google/devtools/build/lib/analysis/LabelAndLocation.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.devtools.build.lib.cmdline.Label;
2020
import com.google.devtools.build.lib.packages.Target;
2121
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
22-
import com.google.errorprone.annotations.InlineMe;
2322
import net.starlark.java.syntax.Location;
2423

2524
/**
@@ -35,16 +34,6 @@ public record LabelAndLocation(Label label, Location location) {
3534
requireNonNull(location, "location");
3635
}
3736

38-
@InlineMe(replacement = "this.label()")
39-
public Label getLabel() {
40-
return label();
41-
}
42-
43-
@InlineMe(replacement = "this.location()")
44-
public Location getLocation() {
45-
return location();
46-
}
47-
4837
public static LabelAndLocation of(Target target) {
4938
return new LabelAndLocation(target.getLabel(), target.getLocation());
5039
}

‎src/main/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsProvider.java

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
3030
import com.google.devtools.build.lib.util.ClassName;
3131
import com.google.errorprone.annotations.CanIgnoreReturnValue;
32-
import com.google.errorprone.annotations.InlineMe;
3332
import java.util.Collection;
3433
import java.util.HashSet;
3534
import java.util.List;
@@ -57,26 +56,6 @@ public record RequiredConfigFragmentsProvider(
5756
requireNonNull(starlarkOptions, "starlarkOptions");
5857
}
5958

60-
@InlineMe(replacement = "this.optionsClasses()")
61-
public ImmutableSet<Class<? extends FragmentOptions>> getOptionsClasses() {
62-
return optionsClasses();
63-
}
64-
65-
@InlineMe(replacement = "this.fragmentClasses()")
66-
public ImmutableSet<Class<? extends Fragment>> getFragmentClasses() {
67-
return fragmentClasses();
68-
}
69-
70-
@InlineMe(replacement = "this.defines()")
71-
public ImmutableSet<String> getDefines() {
72-
return defines();
73-
}
74-
75-
@InlineMe(replacement = "this.starlarkOptions()")
76-
public ImmutableSet<Label> getStarlarkOptions() {
77-
return starlarkOptions();
78-
}
79-
8059
private static final Interner<RequiredConfigFragmentsProvider> interner =
8160
BlazeInterners.newWeakInterner();
8261

@@ -90,12 +69,12 @@ public final String toString() {
9069
return MoreObjects.toStringHelper(RequiredConfigFragmentsProvider.class)
9170
.add(
9271
"optionsClasses",
93-
Collections2.transform(getOptionsClasses(), ClassName::getSimpleNameWithOuter))
72+
Collections2.transform(optionsClasses(), ClassName::getSimpleNameWithOuter))
9473
.add(
9574
"fragmentClasses",
96-
Collections2.transform(getFragmentClasses(), ClassName::getSimpleNameWithOuter))
97-
.add("defines", getDefines())
98-
.add("starlarkOptions", getStarlarkOptions())
75+
Collections2.transform(fragmentClasses(), ClassName::getSimpleNameWithOuter))
76+
.add("defines", defines())
77+
.add("starlarkOptions", starlarkOptions())
9978
.toString();
10079
}
10180

@@ -188,10 +167,10 @@ public Builder addStarlarkOptions(Collection<Label> starlarkOptions) {
188167
@CanIgnoreReturnValue
189168
public Builder merge(RequiredConfigFragmentsProvider provider) {
190169
if (provider != null) {
191-
optionsClasses = appendAll(optionsClasses, provider.getOptionsClasses());
192-
fragmentClasses = appendAll(fragmentClasses, provider.getFragmentClasses());
193-
defines = appendAll(defines, provider.getDefines());
194-
starlarkOptions = appendAll(starlarkOptions, provider.getStarlarkOptions());
170+
optionsClasses = appendAll(optionsClasses, provider.optionsClasses());
171+
fragmentClasses = appendAll(fragmentClasses, provider.fragmentClasses());
172+
defines = appendAll(defines, provider.defines());
173+
starlarkOptions = appendAll(starlarkOptions, provider.starlarkOptions());
195174
}
196175
return this;
197176
}

‎src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,7 @@ private void validateExtraPrerequisites(
21072107

21082108
// Validate toolchains.
21092109
if (toolchainContexts != null) {
2110-
for (var toolchainContext : toolchainContexts.getContextMap().values()) {
2110+
for (var toolchainContext : toolchainContexts.contextMap().values()) {
21112111
for (var prerequisite : toolchainContext.prerequisiteTargets()) {
21122112
validateDirectPrerequisite(TOOLCHAIN_ATTRIBUTE, prerequisite);
21132113
}

‎src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.devtools.build.lib.packages.ExecGroup;
2626
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
2727
import com.google.errorprone.annotations.CanIgnoreReturnValue;
28-
import com.google.errorprone.annotations.InlineMe;
2928
import java.util.HashMap;
3029
import java.util.Map;
3130

@@ -42,31 +41,26 @@ public record ToolchainCollection<T extends ToolchainContext>(ImmutableMap<Strin
4241
requireNonNull(contextMap, "contextMap");
4342
}
4443

45-
@InlineMe(replacement = "this.contextMap()")
46-
public ImmutableMap<String, T> getContextMap() {
47-
return contextMap();
48-
}
49-
5044
public T getDefaultToolchainContext() {
51-
return getContextMap().get(ExecGroup.DEFAULT_EXEC_GROUP_NAME);
45+
return contextMap().get(ExecGroup.DEFAULT_EXEC_GROUP_NAME);
5246
}
5347

5448
public boolean hasToolchainContext(String execGroup) {
55-
return getContextMap().containsKey(execGroup);
49+
return contextMap().containsKey(execGroup);
5650
}
5751

5852
public T getToolchainContext(String execGroup) {
59-
return getContextMap().get(execGroup);
53+
return contextMap().get(execGroup);
6054
}
6155

6256
public ImmutableSet<Label> getResolvedToolchains() {
63-
return getContextMap().values().stream()
57+
return contextMap().values().stream()
6458
.flatMap(c -> c.resolvedToolchainLabels().stream())
6559
.collect(toImmutableSet());
6660
}
6761

6862
public ImmutableSet<String> getExecGroupNames() {
69-
return getContextMap().keySet();
63+
return contextMap().keySet();
7064
}
7165

7266
/**

‎src/main/java/com/google/devtools/build/lib/analysis/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public static ImmutableSet<ConfiguredTargetKey> findImplicitDeps(RuleContext rul
113113
ToolchainCollection<ResolvedToolchainContext> toolchainContexts =
114114
ruleContext.getToolchainContexts();
115115
if (toolchainContexts != null) {
116-
for (ResolvedToolchainContext toolchainContext : toolchainContexts.getContextMap().values()) {
116+
for (ResolvedToolchainContext toolchainContext : toolchainContexts.contextMap().values()) {
117117
if (toolchainContext != null) {
118118
// This logic should stay up to date with the dep creation logic in
119119
// DependencyResolver#partiallyResolveDependencies.

0 commit comments

Comments
 (0)
0