Use the rule location when a handler isn't found

I think this code predates being able to load Skylark .bzl files
from the WORKSPACE. As most non-trivial projects are using load()
in the WORKSPACE, it's fairly uninformative to say "it was
defined in the WORKSPACE file" for this error.

This is to help debug the Tensorflow issue (#3478) but should
generally be more useful than the current message.

PiperOrigin-RevId: 164118176

1 files changed, 1 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
index c7725a40e2..c64c44c647 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleFormatter;
 import com.google.devtools.build.lib.rules.ExternalPackageUtil;
@@ -131,9 +130,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
     }
     if (handler == null) {
       throw new RepositoryFunctionException(
-          new EvalException(
-              Location.fromFile(directories.getWorkspace().getRelative("WORKSPACE")),
-              "Could not find handler for " + rule),
+          new EvalException(rule.getLocation(), "Could not find handler for " + rule),
           Transience.PERSISTENT);
     }