After getting rid of LabelAndConfiguration, simplify some code by providing a ConfiguredTargetKey directly.

PiperOrigin-RevId: 180285691

3 files changed, 3 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
index f71086733c..fd7c26e515 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
@@ -104,10 +104,7 @@ public class ConfiguredTargetQueryEnvironment
   private static final Function<ConfiguredTarget, SkyKey> CT_TO_SKYKEY =
       target -> ConfiguredTargetValue.key(target.getLabel(), target.getConfiguration());
   private static final Function<SkyKey, ConfiguredTargetKey> SKYKEY_TO_CTKEY =
-      skyKey -> {
-        ConfiguredTargetKey key = (ConfiguredTargetKey) skyKey.argument();
-        return ConfiguredTargetKey.of(key.getLabel(), key.getConfiguration());
-      };
+      skyKey -> (ConfiguredTargetKey) skyKey.argument();
   private static final ImmutableList<TargetPatternKey> ALL_PATTERNS;
   private static final KeyExtractor<ConfiguredTarget, ConfiguredTargetKey>
       CONFIGURED_TARGET_KEY_EXTRACTOR = ConfiguredTargetKey::of;
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 f4fb386996..02bb53fd10 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
@@ -104,8 +104,7 @@ public final class CompletionFunction<TValue extends SkyValue, TResult extends S
         throws InterruptedException {
       TargetCompletionKey tcKey = (TargetCompletionKey) skyKey.argument();
       ConfiguredTargetKey lac = tcKey.configuredTargetKey();
-      return (ConfiguredTargetValue)
-          env.getValue(ConfiguredTargetValue.key(lac.getLabel(), lac.getConfiguration()));
+      return (ConfiguredTargetValue) env.getValue(lac.getSkyKey());
     }
 
     @Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java
index 3efc7e84f6..32e5ec5f0b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java
@@ -38,8 +38,7 @@ public final class TestCompletionFunction implements SkyFunction {
       return null;
     }
 
-    ConfiguredTargetValue ctValue = (ConfiguredTargetValue)
-        env.getValue(ConfiguredTargetValue.key(lac.getLabel(), lac.getConfiguration()));
+    ConfiguredTargetValue ctValue = (ConfiguredTargetValue) env.getValue(lac.getSkyKey());
     if (ctValue == null) {
       return null;
     }