Remove ParseFailureListener in favor of posting to EventBus directly

We now have the ExtendedEventHandler, which is available in all the relevant
code paths, so we just post the event directly.

PiperOrigin-RevId: 162200923

1 files changed, 2 insertions, 28 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java
index 1fd16b1989..c6d34b0c09 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java
@@ -19,7 +19,6 @@ import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.ResolvedTargets;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
-import com.google.devtools.build.lib.events.DelegatingEventHandler;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
@@ -35,8 +34,6 @@ import com.google.devtools.build.lib.pkgcache.LoadingPhaseCompleteEvent;
 import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner;
 import com.google.devtools.build.lib.pkgcache.LoadingResult;
 import com.google.devtools.build.lib.pkgcache.PackageManager;
-import com.google.devtools.build.lib.pkgcache.ParseFailureListener;
-import com.google.devtools.build.lib.pkgcache.ParsingFailedEvent;
 import com.google.devtools.build.lib.pkgcache.TargetParsingCompleteEvent;
 import com.google.devtools.build.lib.pkgcache.TargetPatternEvaluator;
 import com.google.devtools.build.lib.pkgcache.TestFilter;
@@ -71,27 +68,6 @@ import javax.annotation.Nullable;
  * <p>The Skyframe-based re-implementation of this class is in TargetPatternPhaseFunction.
  */
 public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner {
-
-  private static final class ParseFailureListenerImpl extends DelegatingEventHandler
-      implements ParseFailureListener, ExtendedEventHandler {
-    private final ExtendedEventHandler eventHandler;
-
-    private ParseFailureListenerImpl(ExtendedEventHandler delegate) {
-      super(delegate);
-      this.eventHandler = delegate;
-    }
-
-    @Override
-    public void parsingError(String targetPattern, String message) {
-      eventHandler.post(new ParsingFailedEvent(targetPattern, message));
-    }
-
-    @Override
-    public void post(ExtendedEventHandler.Postable obj) {
-      eventHandler.post(obj);
-    }
-  }
-
   private static final Logger LOG = Logger.getLogger(LoadingPhaseRunner.class.getName());
 
   private final PackageManager packageManager;
@@ -128,12 +104,10 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner {
     }
 
     targetPatternEvaluator.updateOffset(relativeWorkingDirectory);
-    ExtendedEventHandler parseFailureListener =
-        new ParseFailureListenerImpl(eventHandler);
     // Determine targets to build:
     ResolvedTargets<Target> targets =
         getTargetsToBuild(
-            parseFailureListener, targetPatterns, options.compileOneDependency,
+            eventHandler, targetPatterns, options.compileOneDependency,
             options.buildTagFilterList, options.buildManualTests, keepGoing);
 
     ImmutableSet<Target> filteredTargets = targets.getFilteredTargets();
@@ -149,7 +123,7 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner {
     if (determineTests || buildTestsOnly) {
       // Parse the targets to get the tests.
       ResolvedTargets<Target> testTargets =
-          determineTests(parseFailureListener, targetPatterns, options, keepGoing);
+          determineTests(eventHandler, targetPatterns, options, keepGoing);
       if (testTargets.getTargets().isEmpty() && !testTargets.getFilteredTargets().isEmpty()) {
         eventHandler.handle(Event.warn("All specified test targets were excluded by filters"));
       }