updates: append(y,[]byte(z)...) -> append(y,z...)"

(more are possible but omitted for now as they are part of
specific tests where rather than changing what is there we
should probably expand the tests to cover the new case)

R=rsc, dvyukov
CC=golang-dev
https://golang.org/cl/5247058

diff --git a/src/pkg/bytes/bytes_test.go b/src/pkg/bytes/bytes_test.go
index 55aa0a065c693c14edf86474885532fe846b0a19..ce3f37e4de22ed1df513fd72a43bbb5cba6909bf 100644 (file)
--- a/src/pkg/bytes/bytes_test.go
+++ b/src/pkg/bytes/bytes_test.go
@@ -829,7 +829,7 @@ var ReplaceTests = []ReplaceTest{
 
 func TestReplace(t *testing.T) {
        for _, tt := range ReplaceTests {
-               in := append([]byte(tt.in), []byte("<spare>")...)
+               in := append([]byte(tt.in), "<spare>"...)
                in = in[:len(tt.in)]
                out := Replace(in, []byte(tt.old), []byte(tt.new), tt.n)
                if s := string(out); s != tt.out {

diff --git a/src/pkg/exp/norm/normregtest.go b/src/pkg/exp/norm/normregtest.go
index 3c17741d204040c74a573e59dfa1893172ec9263..cbd73ffa7590b73633c5a31eec436d04fe2bfa1d 100644 (file)
--- a/src/pkg/exp/norm/normregtest.go
+++ b/src/pkg/exp/norm/normregtest.go
@@ -280,7 +280,7 @@ func PerformanceTest() {
        success := make(chan bool, 1)
        go func() {
                buf := bytes.Repeat([]byte("\u035D"), 1024*1024)
-               buf = append(buf, []byte("\u035B")...)
+               buf = append(buf, "\u035B"...)
                norm.NFC.Append(nil, buf...)
                success <- true
        }()

diff --git a/src/pkg/exp/norm/readwriter_test.go b/src/pkg/exp/norm/readwriter_test.go
index b415f2b8cc0abe45435e9bff5dfd53a7dbffeade..68652efa65b175ab6bc9ec6ef40f42fb08833165 100644 (file)
--- a/src/pkg/exp/norm/readwriter_test.go
+++ b/src/pkg/exp/norm/readwriter_test.go
@@ -23,7 +23,7 @@ var bufSizes = []int{1, 2, 3, 4, 5, 6, 7, 8, 100, 101, 102, 103, 4000, 4001, 400
 
 func readFunc(size int) appendFunc {
        return func(f Form, out []byte, s string) []byte {
-               out = append(out, []byte(s)...)
+               out = append(out, s...)
                r := f.Reader(bytes.NewBuffer(out))
                buf := make([]byte, size)
                result := []byte{}
@@ -46,7 +46,7 @@ func TestReader(t *testing.T) {
 
 func writeFunc(size int) appendFunc {
        return func(f Form, out []byte, s string) []byte {
-               in := append(out, []byte(s)...)
+               in := append(out, s...)
                result := new(bytes.Buffer)
                w := f.Writer(result)
                buf := make([]byte, size)

diff --git a/src/pkg/exp/ssh/messages.go b/src/pkg/exp/ssh/messages.go
index def294543c6158a98b127db11025f31379b57d48..851c89747dd4fe2dd363678c47db9e3bcb498c71 100644 (file)
--- a/src/pkg/exp/ssh/messages.go
+++ b/src/pkg/exp/ssh/messages.go
@@ -323,7 +323,7 @@ func marshal(msgType uint8, msg interface{}) []byte {
                        out = append(out, byte(len(s)>>16))
                        out = append(out, byte(len(s)>>8))
                        out = append(out, byte(len(s)))
-                       out = append(out, []byte(s)...)
+                       out = append(out, s...)
                case reflect.Slice:
                        switch t.Elem().Kind() {
                        case reflect.Uint8:
@@ -354,7 +354,7 @@ func marshal(msgType uint8, msg interface{}) []byte {
                                        if j != 0 {
                                                out = append(out, ',')
                                        }
-                                       out = append(out, []byte(field.Index(j).String())...)
+                                       out = append(out, field.Index(j).String()...)
                                }
                        default:
                                panic("slice of unknown type")

diff --git a/src/pkg/json/scanner_test.go b/src/pkg/json/scanner_test.go
index 404cbd0ea9da6492cd000d036ae061c1fd8c0372..4d73eac8aaaedd6ed21cb310f664588a3c3e61df 100644 (file)
--- a/src/pkg/json/scanner_test.go
+++ b/src/pkg/json/scanner_test.go
@@ -175,7 +175,7 @@ func TestNextValueBig(t *testing.T) {
                t.Errorf("invalid rest: %d", len(rest))
        }
 
-       item, rest, err = nextValue(append(jsonBig, []byte("HELLO WORLD")...), &scan)
+       item, rest, err = nextValue(append(jsonBig, "HELLO WORLD"...), &scan)
        if err != nil {
                t.Fatalf("nextValue extra: %s", err)
        }

diff --git a/src/pkg/os/dir_plan9.go b/src/pkg/os/dir_plan9.go
index bbc2cb6472639cbeeb3e13e2265f094f89b7d870..bf17005dd5c709b76121fec0ebb0d15590c26a37 100644 (file)
--- a/src/pkg/os/dir_plan9.go
+++ b/src/pkg/os/dir_plan9.go
@@ -295,6 +295,6 @@ func pstring(b []byte, s string) []byte {
                panic(NewError("string too long"))
        }
        b = pbit16(b, uint16(len(s)))
-       b = append(b, []byte(s)...)
+       b = append(b, s...)
        return b
 }

diff --git a/src/pkg/os/env.go b/src/pkg/os/env.go
index 3772c090b8ffb64c3470311bd6d4e60157cf0293..4844fa3e26d61280b500c1deaa567f781016730e 100644 (file)
--- a/src/pkg/os/env.go
+++ b/src/pkg/os/env.go
@@ -16,9 +16,9 @@ func Expand(s string, mapping func(string) string) string {
        i := 0
        for j := 0; j < len(s); j++ {
                if s[j] == '$' && j+1 < len(s) {
-                       buf = append(buf, []byte(s[i:j])...)
+                       buf = append(buf, s[i:j]...)
                        name, w := getShellName(s[j+1:])
-                       buf = append(buf, []byte(mapping(name))...)
+                       buf = append(buf, mapping(name)...)
                        j += w
                        i = j + 1
                }