From e73680aec0f6d6de3a8cd0f48c01c854703a5b72 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 4 Nov 2011 07:33:55 -0400 Subject: template: format errors R=golang-dev, r CC=golang-dev https://golang.org/cl/5340043 --- src/pkg/text/template/exec.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pkg/text/template/exec.go') diff --git a/src/pkg/text/template/exec.go b/src/pkg/text/template/exec.go index 228477ce79..540fb72c8e 100644 --- a/src/pkg/text/template/exec.go +++ b/src/pkg/text/template/exec.go @@ -445,7 +445,7 @@ func methodByName(receiver reflect.Value, name string) (reflect.Value, bool) { } var ( - osErrorType = reflect.TypeOf((*error)(nil)).Elem() + errorType = reflect.TypeOf((*error)(nil)).Elem() fmtStringerType = reflect.TypeOf((*fmt.Stringer)(nil)).Elem() ) @@ -659,7 +659,7 @@ func (s *state) printValue(n parse.Node, v reflect.Value) { return } - if !v.Type().Implements(fmtStringerType) { + if !v.Type().Implements(errorType) && !v.Type().Implements(fmtStringerType) { if v.CanAddr() && reflect.PtrTo(v.Type()).Implements(fmtStringerType) { v = v.Addr() } else { -- cgit v1.3-5-g9baa