From 7c5a1fd16bc76f010d2321371e3c2ef95b53556d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 3 Jan 2016 12:53:45 +0100 Subject: [PATCH] Replace *bytes.Buffer with io.Writer in rendering Found via github.com/mvdan/interfacer. --- hugolib/site.go | 4 ++-- tpl/template.go | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hugolib/site.go b/hugolib/site.go index 4904c31b7..648ba6454 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -1691,14 +1691,14 @@ func (s *Site) renderAndWritePage(name string, dest string, d interface{}, layou return err } -func (s *Site) render(name string, d interface{}, renderBuffer *bytes.Buffer, layouts ...string) error { +func (s *Site) render(name string, d interface{}, w io.Writer, layouts ...string) error { layout, found := s.findFirstLayout(layouts...) if found == false { jww.WARN.Printf("Unable to locate layout for %s: %s\n", name, layouts) return nil } - if err := s.renderThing(d, layout, renderBuffer); err != nil { + if err := s.renderThing(d, layout, w); err != nil { // Behavior here should be dependent on if running in server or watch mode. distinctErrorLogger.Printf("Error while rendering %s: %v", name, err) if !s.Running() { diff --git a/tpl/template.go b/tpl/template.go index e8b4b8d98..c5a23628a 100644 --- a/tpl/template.go +++ b/tpl/template.go @@ -14,7 +14,6 @@ package tpl import ( - "bytes" "fmt" "github.com/eknkc/amber" bp "github.com/spf13/hugo/bufferpool" @@ -104,7 +103,7 @@ func Partial(name string, context_list ...interface{}) template.HTML { return ExecuteTemplateToHTML(context, "partials/"+name, "theme/partials/"+name) } -func ExecuteTemplate(context interface{}, buffer *bytes.Buffer, layouts ...string) { +func ExecuteTemplate(context interface{}, w io.Writer, layouts ...string) { worked := false for _, layout := range layouts { @@ -115,7 +114,7 @@ func ExecuteTemplate(context interface{}, buffer *bytes.Buffer, layouts ...strin } if localTemplates.Lookup(name) != nil { - err := localTemplates.ExecuteTemplate(buffer, name, context) + err := localTemplates.ExecuteTemplate(w, name, context) if err != nil { jww.ERROR.Println(err, "in", name) }