Replace PackageProvider with TargetProvider where possible

I was trying to simplify GenQuery, and found this during an audit of the
code; it's not sufficient to make any larger changes, but it may help
eventuall.

--
PiperOrigin-RevId: 147023626
MOS_MIGRATED_REVID=147023626

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java b/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java
index c0236010f2..aa84dee8cb 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java
@@ -39,8 +39,8 @@ import com.google.devtools.build.lib.packages.PackageGroup;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.PackageProvider;
 import com.google.devtools.build.lib.pkgcache.TargetEdgeObserver;
+import com.google.devtools.build.lib.pkgcache.TargetProvider;
 import java.util.Collection;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -183,7 +183,7 @@ final class LabelVisitor {
    *
    * Life is not simple.
    */
-  private final PackageProvider packageProvider;
+  private final TargetProvider targetProvider;
   private final DependencyFilter edgeFilter;
   private final SetMultimap<Package, Target> visitedMap =
       Multimaps.synchronizedSetMultimap(HashMultimap.<Package, Target>create());
@@ -199,12 +199,11 @@ final class LabelVisitor {
   /**
    * Construct a LabelVisitor.
    *
-   * @param packageProvider how to resolve labels to targets.
-   * @param edgeFilter which edges may be traversed.
+   * @param targetProvider how to resolve labels to targets
+   * @param edgeFilter which edges may be traversed
    */
-  public LabelVisitor(
-      PackageProvider packageProvider, DependencyFilter edgeFilter) {
-    this.packageProvider = packageProvider;
+  public LabelVisitor(TargetProvider targetProvider, DependencyFilter edgeFilter) {
+    this.targetProvider = targetProvider;
     this.lastVisitation = new VisitationAttributes();
     this.edgeFilter = edgeFilter;
   }
@@ -343,7 +342,7 @@ final class LabelVisitor {
         public void run() {
           try {
             try {
-              visit(from, attr, packageProvider.getTarget(eventHandler, label), depth + 1, count);
+              visit(from, attr, targetProvider.getTarget(eventHandler, label), depth + 1, count);
             } catch (NoSuchThingException e) {
               observeError(from, label, e);
             }