From 1118da25148d20f0fc275dd7ce7a08bd4ac4bdf2 Mon Sep 17 00:00:00 2001 From: Diego Lara Date: Fri, 31 Jan 2025 20:57:20 +0000 Subject: [PATCH] text/template improved comparison error addresses issue #71421 Addresses issue #71421, improves the error message given for comparison. Previous error message did not specify the types causing conflict, just said incompatible types, new error message specifies the two types causing the issue. Change-Id: I9d940ab7573c2763a9d052445140ecd6d38cde5e GitHub-Last-Rev: 6fe7d8101317ea616fd9a8f3f430874b5f946d3e GitHub-Pull-Request: golang/go#71431 Reviewed-on: https://go-review.googlesource.com/c/go/+/644175 Reviewed-by: Cherry Mui Reviewed-by: Rob Pike Auto-Submit: Ian Lance Taylor Reviewed-by: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI --- src/text/template/funcs.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/text/template/funcs.go b/src/text/template/funcs.go index 7d63cf8b7b..4d733135fe 100644 --- a/src/text/template/funcs.go +++ b/src/text/template/funcs.go @@ -409,7 +409,6 @@ func not(arg reflect.Value) bool { var ( errBadComparisonType = errors.New("invalid type for comparison") - errBadComparison = errors.New("incompatible types for comparison") errNoComparison = errors.New("missing argument for comparison") ) @@ -487,7 +486,7 @@ func eq(arg1 reflect.Value, arg2 ...reflect.Value) (bool, error) { truth = arg.Int() >= 0 && arg1.Uint() == uint64(arg.Int()) default: if arg1.IsValid() && arg.IsValid() { - return false, errBadComparison + return false, fmt.Errorf("incompatible types for comparison: %v and %v", arg1.Type(), arg.Type()) } } } else { @@ -553,7 +552,7 @@ func lt(arg1, arg2 reflect.Value) (bool, error) { case k1 == uintKind && k2 == intKind: truth = arg2.Int() >= 0 && arg1.Uint() < uint64(arg2.Int()) default: - return false, errBadComparison + return false, fmt.Errorf("incompatible types for comparison: %v and %v", arg1.Type(), arg2.Type()) } } else { switch k1 { -- 2.51.0