]> Cypherpunks repositories - gostls13.git/commitdiff
projects / gostls13.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 71ba47a)
exp/template: fix build
authorRob Pike <r@golang.org>
Thu, 28 Jul 2011 23:46:32 +0000 (16:46 -0700)
committerRob Pike <r@golang.org>
Thu, 28 Jul 2011 23:46:32 +0000 (16:46 -0700)
TBR=gri

R=gri
CC=golang-dev
https://golang.org/cl/4815070

src/cmd/goinstall/make.go patch | blob | history
src/pkg/rpc/debug.go patch | blob | history

diff --git a/src/cmd/goinstall/make.go b/src/cmd/goinstall/make.go
index 9c1c7c4d79f1dbf023a2c2ce06ab86f807209882..25f79d60df455c9bfdf7530407a23b6cd27142c2 100644 (file)
--- a/src/cmd/goinstall/make.go
+++ b/src/cmd/goinstall/make.go
@@ -138,7 +138,7 @@ type makedata struct {
        Imports   []string // gc/ld import paths
 }
 
-var makefileTemplate = template.New("Makefile").MustParse(`
+var makefileTemplate = template.Must(template.New("Makefile").Parse(`
 include $(GOROOT)/src/Make.inc
 
 TARG={{.Targ}}
@@ -172,4 +172,4 @@ GCIMPORTS={{range .Imports}}-I "{{.}}" {{end}}
 LDIMPORTS={{range .Imports}}-L "{{.}}" {{end}}
 
 include $(GOROOT)/src/Make.{{.Type}}
-`)
+`))
diff --git a/src/pkg/rpc/debug.go b/src/pkg/rpc/debug.go
index e0602e676f2c84e61948adf6da45ad47c7054ce9..ae76a4586ad504538e93b8e55fca275061b5f508 100644 (file)
--- a/src/pkg/rpc/debug.go
+++ b/src/pkg/rpc/debug.go
@@ -36,7 +36,7 @@ const debugText = `<html>
        </body>
        </html>`
 
-var debug = template.New("RPC debug").MustParse(debugText)
+var debug = template.Must(template.New("RPC debug").Parse(debugText))
 
 type debugMethod struct {
        Type *methodType
Go GOST TLS 1.3