Quick blanket replacement of getTarget().getLabel() with .getLabel(). Some have already been changed to ConfiguredTargetAndTarget so there's fewer classes than I thought there would be.

PiperOrigin-RevId: 182839243

4 files changed, 21 insertions, 21 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/InputFileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/InputFileConfiguredTarget.java
index a7bc4d180a..45fee8d5e9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/InputFileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/InputFileConfiguredTarget.java
@@ -62,7 +62,7 @@ public final class InputFileConfiguredTarget extends FileConfiguredTarget implem
 
   @Override
   public String toString() {
-    return "InputFileConfiguredTarget(" + getTarget().getLabel() + ")";
+    return "InputFileConfiguredTarget(" + getLabel() + ")";
   }
 
   @Override
@@ -82,6 +82,6 @@ public final class InputFileConfiguredTarget extends FileConfiguredTarget implem
 
   @Override
   public void repr(SkylarkPrinter printer) {
-    printer.append("<input file target " + getTarget().getLabel() + ">");
+    printer.append("<input file target " + getLabel() + ">");
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java
index 5fa9406873..4dde71b8f1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java
@@ -124,6 +124,6 @@ public class OutputFileConfiguredTarget extends FileConfiguredTarget
 
   @Override
   public void repr(SkylarkPrinter printer) {
-    printer.append("<output file target " + getTarget().getLabel() + ">");
+    printer.append("<output file target " + getLabel() + ">");
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 43031f6550..9b68d8f3e1 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -457,7 +457,7 @@ public final class BuildTool {
             String.format(
                 "Top level targets %s and %s have different configurations (top level "
                     + "targets with different configurations is not supported)",
-                sampleTAndC.getTarget().getLabel(), targAndConfig.getTarget().getLabel()));
+                sampleTAndC.getLabel(), targAndConfig.getLabel()));
       }
     }
 
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 fd7c26e515..8321d91b93 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
@@ -176,6 +176,22 @@ public class ConfiguredTargetQueryEnvironment
     return value == null ? null : value.getConfiguredTarget();
   }
 
+  private ConfiguredTarget getConfiguredTarget(Label label) throws InterruptedException {
+    // Try with host configuration.
+    ConfiguredTarget configuredTarget =
+        getConfiguredTarget(ConfiguredTargetValue.key(label, hostConfiguration));
+    if (configuredTarget != null) {
+      return configuredTarget;
+    }
+    configuredTarget =
+        getConfiguredTarget(ConfiguredTargetValue.key(label, defaultTargetConfiguration));
+    if (configuredTarget != null) {
+      return configuredTarget;
+    }
+    // Last chance: source file.
+    return getConfiguredTarget(ConfiguredTargetValue.key(label, null));
+  }
+
   @Override
   public void close() {}
 
@@ -313,7 +329,7 @@ public class ConfiguredTargetQueryEnvironment
                   dep ->
                       !implicitDeps.contains(
                           ConfiguredTargetKey.of(
-                              dep.getTarget().getLabel(), dep.getConfiguration())))
+                              dep.getLabel(), dep.getConfiguration())))
               .collect(Collectors.toList());
     }
     return deps;
@@ -419,22 +435,6 @@ public class ConfiguredTargetQueryEnvironment
     return configuredTarget == null ? null : configuredTarget.getTarget();
   }
 
-  private ConfiguredTarget getConfiguredTarget(Label label) throws InterruptedException {
-    // Try with host configuration.
-    ConfiguredTarget configuredTarget =
-        getConfiguredTarget(ConfiguredTargetValue.key(label, hostConfiguration));
-    if (configuredTarget != null) {
-      return configuredTarget;
-    }
-    configuredTarget =
-        getConfiguredTarget(ConfiguredTargetValue.key(label, defaultTargetConfiguration));
-    if (configuredTarget != null) {
-      return configuredTarget;
-    }
-    // Last chance: source file.
-    return getConfiguredTarget(ConfiguredTargetValue.key(label, null));
-  }
-
   @Override
   public ThreadSafeMutableSet<ConfiguredTarget> createThreadSafeMutableSet() {
     return new ThreadSafeMutableKeyExtractorBackedSetImpl<>(