template: reverse order of arguments to Execute

In line with other functions such as Fprintf, put the
thing to be written first.

Apologies for the breakages this is sure to cause.

R=rsc, gri, adg, eds, r2, aam
CC=golang-dev
https://golang.org/cl/4169042

diff --git a/doc/codelab/wiki/final.go b/doc/codelab/wiki/final.go
index 8ecd97d7484432107495ba05b938bab8df0c0225..c97a699d4b95b7b2b36e4545e284c5e0efb492e8 100644 (file)
--- a/doc/codelab/wiki/final.go
+++ b/doc/codelab/wiki/final.go
@@ -64,7 +64,7 @@ func init() {
 }
 
 func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
-       err := templates[tmpl].Execute(p, w)
+       err := templates[tmpl].Execute(w, p)
        if err != nil {
                http.Error(w, err.String(), http.StatusInternalServerError)
        }

diff --git a/doc/codelab/wiki/index.html b/doc/codelab/wiki/index.html
index e29106a6e52e5bd889daca8baae2130c3a079a91..fc8c27bfa0b57f51dbb83fe7a4cb947dae670a79 100644 (file)
--- a/doc/codelab/wiki/index.html
+++ b/doc/codelab/wiki/index.html
@@ -734,7 +734,7 @@ the <code>Execute</code> method on the appropriate <code>Template</code> from
 
 <pre>
 func renderTemplate(w http.ResponseWriter, tmpl string, p *Page) {
-       err := templates[tmpl].Execute(p, w)
+       err := templates[tmpl].Execute(w, p)
        if err != nil {
                http.Error(w, err.String(), http.StatusInternalServerError)
        }

diff --git a/doc/effective_go.html b/doc/effective_go.html
index 71d50c02b7a6397696ba74aef59c818f786e9dfb..8f94f467be6c8b3361371346459d26698922330f 100644 (file)
--- a/doc/effective_go.html
+++ b/doc/effective_go.html
@@ -2885,7 +2885,7 @@ func main() {
 }
 
 func QR(w http.ResponseWriter, req *http.Request) {
-    templ.Execute(req.FormValue("s"), w)
+    templ.Execute(w, req.FormValue("s"))
 }
 
 func UrlHtmlFormatter(w io.Writer, fmt string, v ...interface{}) {

diff --git a/misc/goplay/goplay.go b/misc/goplay/goplay.go
index bc11bb759b2d3ee71409454b76ab3a68387ab7e8..3ca5ed80c6ffebb3c34c2c61742182d2cbd4f14b 100644 (file)
--- a/misc/goplay/goplay.go
+++ b/misc/goplay/goplay.go
@@ -66,7 +66,7 @@ func FrontPage(w http.ResponseWriter, req *http.Request) {
        if err != nil {
                data = helloWorld
        }
-       frontPage.Execute(data, w)
+       frontPage.Execute(w, data)
 }
 
 // Compile is an HTTP handler that reads Go source code from the request,
@@ -123,7 +123,7 @@ func Compile(w http.ResponseWriter, req *http.Request) {
        if *htmlOutput {
                w.Write(out)
        } else {
-               output.Execute(out, w)
+               output.Execute(w, out)
        }
 }
 
@@ -132,9 +132,9 @@ func Compile(w http.ResponseWriter, req *http.Request) {
 func error(w http.ResponseWriter, out []byte, err os.Error) {
        w.WriteHeader(404)
        if out != nil {
-               output.Execute(out, w)
+               output.Execute(w, out)
        } else {
-               output.Execute(err.String(), w)
+               output.Execute(w, err.String())
        }
 }
 

diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index fd3f97f62b820fe5519e26821fe06af8f0764b74..ca9e2bb5425032e23991b330eeecec2b9549466d 100644 (file)
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -674,7 +674,7 @@ func servePage(w http.ResponseWriter, title, subtitle, query string, content []b
                content,
        }
 
-       if err := godocHTML.Execute(&d, w); err != nil {
+       if err := godocHTML.Execute(w, &d); err != nil {
                log.Printf("godocHTML.Execute: %s", err)
        }
 }
@@ -742,7 +742,7 @@ func serveHTMLDoc(w http.ResponseWriter, r *http.Request, abspath, relpath strin
 
 func applyTemplate(t *template.Template, name string, data interface{}) []byte {
        var buf bytes.Buffer
-       if err := t.Execute(data, &buf); err != nil {
+       if err := t.Execute(&buf, data); err != nil {
                log.Printf("%s.Execute: %s", name, err)
        }
        return buf.Bytes()

diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go
index 4fd2b88c69f6f3de1e14602b6573099a1940e0bb..7494b339afa499bfd0f8e40d2b6c68431c0c939c 100644 (file)
--- a/src/cmd/godoc/main.go
+++ b/src/cmd/godoc/main.go
@@ -381,7 +381,7 @@ func main() {
                }
        }
 
-       if err := packageText.Execute(info, os.Stdout); err != nil {
+       if err := packageText.Execute(os.Stdout, info); err != nil {
                log.Printf("packageText.Execute: %s", err)
        }
 }

diff --git a/src/cmd/goinstall/make.go b/src/cmd/goinstall/make.go
index 93a648b2bf28e1c2a0a4001cac5af0058c1080c5..8d4d6c5d28b3e8d4a579b647957f0fc1b4238961 100644 (file)
--- a/src/cmd/goinstall/make.go
+++ b/src/cmd/goinstall/make.go
@@ -75,7 +75,7 @@ func makeMakefile(dir, pkg string) ([]byte, os.Error) {
 
        var buf bytes.Buffer
        md := makedata{pkg, goFiles, cgoFiles, oFiles}
-       if err := makefileTemplate.Execute(&md, &buf); err != nil {
+       if err := makefileTemplate.Execute(&buf, &md); err != nil {
                return nil, err
        }
        return buf.Bytes(), nil

diff --git a/src/pkg/exp/eval/gen.go b/src/pkg/exp/eval/gen.go
index a2b1198465827667ed6f1fce97b09d8d6b894210..de98a5d15591c5935579c42913f6d8a2b10e8013 100644 (file)
--- a/src/pkg/exp/eval/gen.go
+++ b/src/pkg/exp/eval/gen.go
@@ -368,7 +368,7 @@ func main() {
        if err != nil {
                log.Exit(err)
        }
-       err = t.Execute(data, os.Stdout)
+       err = t.Execute(os.Stdout, data)
        if err != nil {
                log.Exit(err)
        }

diff --git a/src/pkg/rpc/debug.go b/src/pkg/rpc/debug.go
index 44b32e04ba0812bd1ae1bdd6f4add0b6efce7935..32dc8a18ba212daac06758a63452250acf9e1947 100644 (file)
--- a/src/pkg/rpc/debug.go
+++ b/src/pkg/rpc/debug.go
@@ -83,7 +83,7 @@ func (server debugHTTP) ServeHTTP(w http.ResponseWriter, req *http.Request) {
        }
        server.Unlock()
        sort.Sort(services)
-       err := debug.Execute(services, w)
+       err := debug.Execute(w, services)
        if err != nil {
                fmt.Fprintln(w, "rpc: error executing template:", err.String())
        }

diff --git a/src/pkg/template/template.go b/src/pkg/template/template.go
index f71d76c08899f02c28f7aec3e1db14185801c05f..36fd06dc22c941e268ed6da0af3286d6f1820a06 100644 (file)
--- a/src/pkg/template/template.go
+++ b/src/pkg/template/template.go
@@ -972,7 +972,7 @@ func (t *Template) ParseFile(filename string) (err os.Error) {
 
 // Execute applies a parsed template to the specified data object,
 // generating output to wr.
-func (t *Template) Execute(data interface{}, wr io.Writer) (err os.Error) {
+func (t *Template) Execute(wr io.Writer, data interface{}) (err os.Error) {
        // Extract the driver data.
        val := reflect.NewValue(data)
        defer checkError(&err)

diff --git a/src/pkg/template/template_test.go b/src/pkg/template/template_test.go
index a89fceb4cb23a0eefeb57a7d58e944a5899bed53..9df3ab59c001ba6c82ece467aaa73dd664165afc 100644 (file)
--- a/src/pkg/template/template_test.go
+++ b/src/pkg/template/template_test.go
@@ -492,7 +492,7 @@ func testAll(t *testing.T, parseFunc func(*Test) (*Template, os.Error)) {
                        t.Error("unexpected parse error: ", err)
                        continue
                }
-               err = tmpl.Execute(s, &buf)
+               err = tmpl.Execute(&buf, s)
                if test.err == "" {
                        if err != nil {
                                t.Error("unexpected execute error:", err)
@@ -517,7 +517,7 @@ func TestMapDriverType(t *testing.T) {
                t.Error("unexpected parse error:", err)
        }
        var b bytes.Buffer
-       err = tmpl.Execute(mp, &b)
+       err = tmpl.Execute(&b, mp)
        if err != nil {
                t.Error("unexpected execute error:", err)
        }
@@ -535,7 +535,7 @@ func TestMapNoEntry(t *testing.T) {
                t.Error("unexpected parse error:", err)
        }
        var b bytes.Buffer
-       err = tmpl.Execute(mp, &b)
+       err = tmpl.Execute(&b, mp)
        if err != nil {
                t.Error("unexpected execute error:", err)
        }
@@ -552,7 +552,7 @@ func TestStringDriverType(t *testing.T) {
                t.Error("unexpected parse error:", err)
        }
        var b bytes.Buffer
-       err = tmpl.Execute("hello", &b)
+       err = tmpl.Execute(&b, "hello")
        if err != nil {
                t.Error("unexpected execute error:", err)
        }
@@ -569,7 +569,7 @@ func TestTwice(t *testing.T) {
                t.Error("unexpected parse error:", err)
        }
        var b bytes.Buffer
-       err = tmpl.Execute("hello", &b)
+       err = tmpl.Execute(&b, "hello")
        if err != nil {
                t.Error("unexpected parse error:", err)
        }
@@ -578,7 +578,7 @@ func TestTwice(t *testing.T) {
        if s != expect {
                t.Errorf("failed passing string as data: expected %q got %q", expect, s)
        }
-       err = tmpl.Execute("hello", &b)
+       err = tmpl.Execute(&b, "hello")
        if err != nil {
                t.Error("unexpected parse error:", err)
        }
@@ -614,7 +614,7 @@ func TestCustomDelims(t *testing.T) {
                                continue
                        }
                        var b bytes.Buffer
-                       err = tmpl.Execute("hello", &b)
+                       err = tmpl.Execute(&b, "hello")
                        s := b.String()
                        if s != "template: hello"+ldelim+rdelim {
                                t.Errorf("failed delim check(%q %q) %q got %q", ldelim, rdelim, text, s)
@@ -635,7 +635,7 @@ func TestVarIndirection(t *testing.T) {
        if err != nil {
                t.Fatal("unexpected parse error:", err)
        }
-       err = tmpl.Execute(s, &buf)
+       err = tmpl.Execute(&buf, s)
        if err != nil {
                t.Fatal("unexpected execute error:", err)
        }
@@ -669,7 +669,7 @@ func TestReferenceToUnexported(t *testing.T) {
        if err != nil {
                t.Fatal("unexpected parse error:", err)
        }
-       err = tmpl.Execute(u, &buf)
+       err = tmpl.Execute(&buf, u)
        if err == nil {
                t.Fatal("expected execute error, got none")
        }
@@ -749,7 +749,7 @@ func TestFormatters(t *testing.T) {
                                continue
                        }
                        buf := bytes.NewBuffer(nil)
-                       err = tmpl.Execute(data, buf)
+                       err = tmpl.Execute(buf, data)
                        if err != nil {
                                t.Error("unexpected Execute error: ", err)
                                continue

diff --git a/test/chan/select5.go b/test/chan/select5.go
index 0678b8dab627c36017714bbd3120cff98c4a2728..e7ca9e015c1c228d334151c4b0188a625ed7ff68 100644 (file)
--- a/test/chan/select5.go
+++ b/test/chan/select5.go
@@ -49,7 +49,7 @@ func main() {
 }
 
 func run(t *template.Template, a interface{}, out io.Writer) {
-       if err := t.Execute(a, out); err != nil {
+       if err := t.Execute(out, a); err != nil {
                panic(err)
        }
 }