From: Rob Pike <r@golang.org>
Date: Fri, 9 Dec 2011 18:47:36 +0000 (-0800)
Subject: html/template: make Must work
X-Git-Tag: weekly.2011-12-14~114
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5912869d61f0b20aaa9ea858195e8039ddc78dc6;p=gostls13.git

html/template: make Must work
Fixes #2545.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5475054
---

diff --git a/src/pkg/html/template/template.go b/src/pkg/html/template/template.go
index 02e33e125a..4657f6ec52 100644
--- a/src/pkg/html/template/template.go
+++ b/src/pkg/html/template/template.go
@@ -183,7 +183,9 @@ func (t *Template) Lookup(name string) *Template {
 
 // Must panics if err is non-nil in the same way as template.Must.
 func Must(t *Template, err error) *Template {
-	t.text = template.Must(t.text, err)
+	if err != nil {
+		panic(err)
+	}
 	return t
 }