commit 9e54088754a8fbe1b73c02e7e25e8f46c44bc7d5
author laurentlb <laurentlb@google.com> Fri Jul 07 06:58:45 2017 -0400
committer John Cater <jcater@google.com> Fri Jul 07 07:09:05 2017 -0400
tree e6b2f59bb776a534c5e31908c21b5665f0a6bfea
parent 12a6a7a7536b063f923d53eb9f6c244849b69fc5

Improve error message when calling a builtin function with wrong type

Error message is simpler and doesn't show the type of all arguments.

RELNOTES: None.
PiperOrigin-RevId: 161187134

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 4fa16cd..a0f6316 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -492,9 +492,8 @@
   @Test
   public void testAttrDefaultValueBadType() throws Exception {
     checkErrorContains(
-        "method attr.string(*, default: string, mandatory: bool, values: sequence of strings) "
-            + "is not applicable for arguments (int, bool, list): 'default' is 'int', "
-            + "but should be 'string'",
+        "argument 'default' has type 'int', but should be 'string'\n"
+            + "in call to builtin function attr.string(*, default, mandatory, values)",
         "attr.string(default = 1)");
   }
 
@@ -569,9 +568,8 @@
   @Test
   public void testLateBoundAttrWorksWithOnlyLabel() throws Exception {
     checkEvalError(
-        "method attr.string(*, default: string, mandatory: bool, values: sequence of strings) "
-            + "is not applicable for arguments (function, bool, list): 'default' is 'function', "
-            + "but should be 'string'",
+        "argument 'default' has type 'function', but should be 'string'\n"
+            + "in call to builtin function attr.string(*, default, mandatory, values)",
         "def attr_value(cfg): return 'a'",
         "attr.string(default=attr_value)");
   }