aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2011-08-17 13:57:06 +1000
committerRob Pike <r@golang.org>2011-08-17 13:57:06 +1000
commitff0240da6db6bd7cb5f87b3b8bde965cf5dd22d5 (patch)
tree94cf8d610042d49645a086b17ef6f2e048268b13
parent1d8f822c170891ac72e85020178c27aded27c644 (diff)
downloadgo-ff0240da6db6bd7cb5f87b3b8bde965cf5dd22d5.tar.gz
go-ff0240da6db6bd7cb5f87b3b8bde965cf5dd22d5.zip
misc: fix a couple of template uses preparatory to the big switch.
R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/4876057
-rw-r--r--doc/tmpltohtml.go2
-rw-r--r--src/pkg/go/doc/comment.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/tmpltohtml.go b/doc/tmpltohtml.go
index 0a509d90b8..f4d2e2c2c4 100644
--- a/doc/tmpltohtml.go
+++ b/doc/tmpltohtml.go
@@ -46,7 +46,7 @@ func main() {
// Read and parse the input.
name := flag.Args()[0]
tmpl := template.New(name).Funcs(template.FuncMap{"code": code})
- if err := tmpl.ParseFile(name); err != nil {
+ if _, err := tmpl.ParseFile(name); err != nil {
log.Fatal(err)
}
diff --git a/src/pkg/go/doc/comment.go b/src/pkg/go/doc/comment.go
index 2a24b14556..af307459ec 100644
--- a/src/pkg/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
@@ -11,7 +11,7 @@ import (
"io"
"regexp"
"strings"
- "template" // for htmlEscape
+ "exp/template" // for HTMLEscape
)
func isWhitespace(ch byte) bool { return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' }