replace more cmp.Equal calls with cmp.Diff

expr_lexer_test.go

@@ -576,11 +576,11 @@ func TestLexExpression(t *testing.T) {
 				values = append(values, t.Value)
 			}
 
-			if !cmp.Equal(kinds, tc.tokens) {
-				t.Errorf("wanted token kinds %#v but got %#v", tc.tokens, kinds)
+			if diff := cmp.Diff(kinds, tc.tokens); diff != "" {
+				t.Error("unexpectedtoken kinds:", diff)
 			}
-			if !cmp.Equal(values, tc.values) {
-				t.Errorf("wanted values %#v but got %#v", tc.values, values)
+			if diff := cmp.Diff(values, tc.values); diff != "" {
+				t.Error("unexpectedtoken values:", diff)
 			}
 
 			if offset != len(tc.input)+len("}}") {

expr_sema_test.go

@@ -1664,8 +1664,8 @@ func TestExprSemanticsCheckerUpdateInputsMultipleTimes(t *testing.T) {
 			c.UpdateInputs(tc.first)
 			c.UpdateDispatchInputs(tc.second)
 			have := c.vars["inputs"]
-			if !cmp.Equal(have, tc.want) {
-				t.Fatal("Merged `inputs` type is unexpected", have, "v.s.", tc.want)
+			if diff := cmp.Diff(have, tc.want); diff != "" {
+				t.Fatal(diff)
 			}
 		})
 	}
@@ -1784,8 +1784,8 @@ func TestParseFormatSpecifiers(t *testing.T) {
 			}
 			have := parseFormatFuncSpecifiers(tc.in, len(tc.want))
 
-			if !cmp.Equal(want, have) {
-				t.Fatal(cmp.Diff(want, have))
+			if diff := cmp.Diff(want, have); diff != "" {
+				t.Fatal(diff)
 			}
 		})
 	}

expr_type_test.go

@@ -1029,8 +1029,8 @@ func TestExprTypeTypeOfJSONValue(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.what, func(t *testing.T) {
 			have := typeOfJSONValue(tc.value)
-			if !cmp.Equal(tc.want, have) {
-				t.Fatal(cmp.Diff(tc.want, have))
+			if diff := cmp.Diff(tc.want, have); diff != "" {
+				t.Fatal(diff)
 			}
 		})
 	}