diff options
| author |  janakr <janakr@google.com> | 2017-12-20 13:37:13 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-20 13:39:27 -0800 |
| commit | ac2cd35438e13504336ced63b6a06581445b66a5 (patch) | |
| tree | d0e61cc25908698618839c0dff681d3e0857bebe /src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java | |
| parent | 8a56db3724333c4bf5f0d54e22ffa122c3078b4d (diff) | |
Get rid of LabelAndConfiguration class: ConfiguredTargetKey contains the same information and is more useful, since it's practically a SkyKey.
PiperOrigin-RevId: 179727105
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java index 68533985cc..103fd73167 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.MissingInputFileException; import com.google.devtools.build.lib.analysis.AspectCompleteEvent; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.LabelAndConfiguration; import com.google.devtools.build.lib.analysis.TargetCompleteEvent; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper; @@ -101,7 +100,7 @@ public final class CompletionFunction<TValue extends SkyValue, TResult extends S public ConfiguredTargetValue getValueFromSkyKey(SkyKey skyKey, Environment env) throws InterruptedException { TargetCompletionKey tcKey = (TargetCompletionKey) skyKey.argument(); - LabelAndConfiguration lac = tcKey.labelAndConfiguration(); + ConfiguredTargetKey lac = tcKey.configuredTargetKey(); return (ConfiguredTargetValue) env.getValue(ConfiguredTargetValue.key(lac.getLabel(), lac.getConfiguration())); } @@ -151,7 +150,7 @@ public final class CompletionFunction<TValue extends SkyValue, TResult extends S @Override public String extractTag(SkyKey skyKey) { return Label.print( - ((TargetCompletionKey) skyKey.argument()).labelAndConfiguration().getLabel()); + ((TargetCompletionKey) skyKey.argument()).configuredTargetKey().getLabel()); } } |