From 790d60537e0888464a1c8a6f98c20baf2eeacdf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 22 Aug 2022 22:11:03 +0100 Subject: [PATCH] all: append(bytes, str...) works out of the box MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the append docs in the builtin package: As a special case, it is legal to append a string to a byte slice, like this: slice = append([]byte("hello "), "world"...) Change-Id: Ib14039a7476873b12a3aefccd8863e8d628b9249 Reviewed-on: https://go-review.googlesource.com/c/go/+/425102 Reviewed-by: hopehook Reviewed-by: Ian Lance Taylor Reviewed-by: David Chase TryBot-Result: Gopher Robot Run-TryBot: Daniel Martí --- src/cmd/go/internal/modindex/write.go | 2 +- src/cmd/internal/quoted/quoted.go | 6 +++--- src/syscall/exec_linux.go | 2 +- src/time/format.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/go/internal/modindex/write.go b/src/cmd/go/internal/modindex/write.go index 7db1fb08705..df1467d9d18 100644 --- a/src/cmd/go/internal/modindex/write.go +++ b/src/cmd/go/internal/modindex/write.go @@ -126,7 +126,7 @@ func (e *encoder) String(s string) { e.strings[s] = pos e.Int(pos) e.stringTable = binary.AppendUvarint(e.stringTable, uint64(len(s))) - e.stringTable = append(e.stringTable, []byte(s)...) + e.stringTable = append(e.stringTable, s...) } func (e *encoder) Bool(b bool) { diff --git a/src/cmd/internal/quoted/quoted.go b/src/cmd/internal/quoted/quoted.go index b3d3c400ec7..a8122750735 100644 --- a/src/cmd/internal/quoted/quoted.go +++ b/src/cmd/internal/quoted/quoted.go @@ -83,16 +83,16 @@ func Join(args []string) (string, error) { } switch { case !sawSpace && !sawSingleQuote && !sawDoubleQuote: - buf = append(buf, []byte(arg)...) + buf = append(buf, arg...) case !sawSingleQuote: buf = append(buf, '\'') - buf = append(buf, []byte(arg)...) + buf = append(buf, arg...) buf = append(buf, '\'') case !sawDoubleQuote: buf = append(buf, '"') - buf = append(buf, []byte(arg)...) + buf = append(buf, arg...) buf = append(buf, '"') default: diff --git a/src/syscall/exec_linux.go b/src/syscall/exec_linux.go index 4ae7f33462e..d9e9e6df440 100644 --- a/src/syscall/exec_linux.go +++ b/src/syscall/exec_linux.go @@ -590,7 +590,7 @@ func forkExecPipe(p []int) (err error) { func formatIDMappings(idMap []SysProcIDMap) []byte { var data []byte for _, im := range idMap { - data = append(data, []byte(itoa.Itoa(im.ContainerID)+" "+itoa.Itoa(im.HostID)+" "+itoa.Itoa(im.Size)+"\n")...) + data = append(data, itoa.Itoa(im.ContainerID)+" "+itoa.Itoa(im.HostID)+" "+itoa.Itoa(im.Size)+"\n"...) } return data } diff --git a/src/time/format.go b/src/time/format.go index 1887e6bce60..c32861c6db6 100644 --- a/src/time/format.go +++ b/src/time/format.go @@ -588,7 +588,7 @@ func (t Time) GoString() string { // Of these, Location(loc.name) is the least disruptive. This is an edge // case we hope not to hit too often. buf = append(buf, `time.Location(`...) - buf = append(buf, []byte(quote(loc.name))...) + buf = append(buf, quote(loc.name)...) buf = append(buf, ')') } buf = append(buf, ')')