Minor improvements to error messages.

In case of conflict, show the location of the original rule.

--
PiperOrigin-RevId: 143541281
MOS_MIGRATED_REVID=143541281

1 files changed, 4 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java b/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java
index 464e81cae4..2f29dfd1d4 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java
@@ -325,13 +325,15 @@ public class FunctionTest extends EvaluationTestCase {
   @Test
   public void testKwargsBadKey() throws Exception {
     checkEvalError(
-        "keywords must be strings, not int", "def func(a, b): return a + b", "func('a', **{3: 1})");
+        "keywords must be strings, not 'int'",
+        "def func(a, b): return a + b",
+        "func('a', **{3: 1})");
   }
 
   @Test
   public void testKwargsIsNotDict() throws Exception {
     checkEvalError(
-        "argument after ** must be a dictionary, not int",
+        "argument after ** must be a dictionary, not 'int'",
         "def func(a, b): return a + b",
         "func('a', **42)");
   }