diff options
| author | Roger Peppe <rogpeppe@gmail.com> | 2011-07-28 08:41:06 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2011-07-28 08:41:06 -0700 |
| commit | 3041f2a37c27231b781a0c71b786afddde5afad9 (patch) | |
| tree | b93a8812b584ae6ede04fa3f7fdf668b2e679bae | |
| parent | fa249cae384ae2b56351cd9856ffaed49b5b931e (diff) | |
| download | go-3041f2a37c27231b781a0c71b786afddde5afad9.tar.gz go-3041f2a37c27231b781a0c71b786afddde5afad9.zip | |
exp/template: make Set.MustParse* methods return the set.
This brings them into line with the Template.MustParse* methods
and makes it possible to use them in global variable initializations.
R=r
CC=golang-dev
https://golang.org/cl/4798059
| -rw-r--r-- | src/pkg/exp/template/helper.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pkg/exp/template/helper.go b/src/pkg/exp/template/helper.go index 5eb46ee1df..97917fddfc 100644 --- a/src/pkg/exp/template/helper.go +++ b/src/pkg/exp/template/helper.go @@ -192,11 +192,12 @@ func (s *Set) ParseTemplateFile(filenames ...string) os.Error { // MustParseTemplateFile is like ParseTemplateFile but // panics if there is an error. -func (s *Set) MustParseTemplateFile(filenames ...string) { +func (s *Set) MustParseTemplateFile(filenames ...string) *Set { err := s.ParseTemplateFile(filenames...) if err != nil { panic(err) } + return s } // ParseTemplateFiles parses the template files matched by the @@ -228,11 +229,12 @@ func (s *Set) ParseTemplateFiles(pattern string) os.Error { // MustParseTemplateFile is like ParseTemplateFiles but // panics if there is an error. -func (s *Set) MustParseTemplateFiles(pattern string) { +func (s *Set) MustParseTemplateFiles(pattern string) *Set { err := s.ParseTemplateFiles(pattern) if err != nil { panic(err) } + return s } // ParseTemplateFile creates a set by parsing the named files, |