Merge pull request #729 from twpayne/strings-builder

Use strings.Builder instead of bytes.Buffer

cmd/completion.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"bytes"
 	"errors"
+	"strings"
 
 	"github.com/spf13/cobra"
 )
@@ -30,7 +30,7 @@ func init() {
 }
 
 func (c *Config) runCompletion(cmd *cobra.Command, args []string) error {
-	output := &bytes.Buffer{}
+	output := &strings.Builder{}
 	switch args[0] {
 	case "bash":
 		if err := rootCmd.GenBashCompletion(output); err != nil {
@@ -49,8 +49,8 @@ func (c *Config) runCompletion(cmd *cobra.Command, args []string) error {
 	}
 
 	if c.completion.output == "" {
-		_, err := c.Stdout.Write(output.Bytes())
+		_, err := c.Stdout.Write([]byte(output.String()))
 		return err
 	}
-	return c.fs.WriteFile(c.completion.output, output.Bytes(), 0o666)
+	return c.fs.WriteFile(c.completion.output, []byte(output.String()), 0o666)
 }

cmd/config.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"bufio"
-	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -230,11 +229,11 @@ func (c *Config) autoCommit(vcs VCS) error {
 	if err != nil {
 		return err
 	}
-	b := &bytes.Buffer{}
-	if err := commitMessageTmpl.Execute(b, status); err != nil {
+	sb := &strings.Builder{}
+	if err := commitMessageTmpl.Execute(sb, status); err != nil {
 		return err
 	}
-	commitArgs := vcs.CommitArgs(b.String())
+	commitArgs := vcs.CommitArgs(sb.String())
 	return c.run(c.SourceDir, c.SourceVCS.Command, commitArgs...)
 }
 

cmd/executetemplate.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"bytes"
 	"io/ioutil"
 	"strconv"
+	"strings"
 
 	"github.com/spf13/cobra"
 )
@@ -46,7 +46,7 @@ func (c *Config) runExecuteTemplateCmd(cmd *cobra.Command, args []string) error
 	if err != nil {
 		return err
 	}
-	output := &bytes.Buffer{}
+	output := &strings.Builder{}
 	switch len(args) {
 	case 0:
 		data, err := ioutil.ReadAll(c.Stdin)
@@ -73,8 +73,8 @@ func (c *Config) runExecuteTemplateCmd(cmd *cobra.Command, args []string) error
 	}
 
 	if c.executeTemplate.output == "" {
-		_, err = c.Stdout.Write(output.Bytes())
+		_, err = c.Stdout.Write([]byte(output.String()))
 		return err
 	}
-	return c.fs.WriteFile(c.executeTemplate.output, output.Bytes(), 0o666)
+	return c.fs.WriteFile(c.executeTemplate.output, []byte(output.String()), 0o666)
 }

internal/chezmoi/targetstate.go

@@ -399,11 +399,11 @@ func (ts *TargetState) ExecuteTemplateData(name string, data []byte) ([]byte, er
 			return nil, err
 		}
 	}
-	output := &bytes.Buffer{}
-	if err = tmpl.ExecuteTemplate(output, name, ts.TemplateData); err != nil {
+	sb := &strings.Builder{}
+	if err = tmpl.ExecuteTemplate(sb, name, ts.TemplateData); err != nil {
 		return nil, err
 	}
-	return output.Bytes(), nil
+	return []byte(sb.String()), nil
 }
 
 // Get returns the state of the given target, or nil if no such target is found.

internal/generate-assets/main.go

@@ -7,6 +7,7 @@ import (
 	"go/format"
 	"io/ioutil"
 	"os"
+	"strings"
 	"text/template"
 )
 
@@ -32,14 +33,14 @@ func init() {
 )
 
 func printMultiLineString(s []byte) string {
-	b := &bytes.Buffer{}
+	sb := &strings.Builder{}
 	for i, line := range bytes.Split(s, []byte{'\n'}) {
 		if i != 0 {
-			b.WriteString(" +\n")
+			sb.WriteString(" +\n")
 		}
-		b.WriteString(fmt.Sprintf("%q", append(line, '\n')))
+		sb.WriteString(fmt.Sprintf("%q", append(line, '\n')))
 	}
-	return b.String()
+	return sb.String()
 }
 
 func run() error {
@@ -54,8 +55,8 @@ func run() error {
 		}
 	}
 
-	source := &bytes.Buffer{}
-	if err := outputTemplate.Execute(source, struct {
+	sb := &strings.Builder{}
+	if err := outputTemplate.Execute(sb, struct {
 		Tags   string
 		Assets map[string][]byte
 	}{
@@ -65,7 +66,7 @@ func run() error {
 		return err
 	}
 
-	formattedSource, err := format.Source(source.Bytes())
+	formattedSource, err := format.Source([]byte(sb.String()))
 	if err != nil {
 		return err
 	}

internal/generate-helps/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bufio"
-	"bytes"
 	"flag"
 	"fmt"
 	"go/format"
@@ -209,8 +208,8 @@ func run() error {
 		InputFile:  *inputFile,
 		OutputFile: *outputFile,
 	}
-	buf := &bytes.Buffer{}
-	if err := outputTemplate.ExecuteTemplate(buf, "output", data); err != nil {
+	sb := &strings.Builder{}
+	if err := outputTemplate.ExecuteTemplate(sb, "output", data); err != nil {
 		return err
 	}
 
@@ -226,7 +225,7 @@ func run() error {
 		w = fw
 	}
 
-	output, err := format.Source(buf.Bytes())
+	output, err := format.Source([]byte(sb.String()))
 	if err != nil {
 		return err
 	}