mirror of
https://github.com/golang/go
synced 2024-11-26 17:46:57 -07:00
src: Use bytes.Equal instead of bytes.Compare where possible.
bytes.Equal is simpler to read and should also be faster because of short-circuiting and assembly implementations. Change generated automatically using: gofmt -r 'bytes.Compare(a, b) == 0 -> bytes.Equal(a, b)' gofmt -r 'bytes.Compare(a, b) != 0 -> !bytes.Equal(a, b)' R=golang-dev, dave, adg, rsc CC=golang-dev https://golang.org/cl/7038051
This commit is contained in:
parent
56961274bb
commit
46811d27ce
@ -56,7 +56,7 @@ func runTest(t *testing.T, in, out, flags string) {
|
||||
return
|
||||
}
|
||||
|
||||
if got := buf.Bytes(); bytes.Compare(got, expected) != 0 {
|
||||
if got := buf.Bytes(); !bytes.Equal(got, expected) {
|
||||
t.Errorf("(gofmt %s) != %s (see %s.gofmt)", in, out, in)
|
||||
d, err := diff(expected, got)
|
||||
if err == nil {
|
||||
|
@ -84,7 +84,7 @@ func testFile(t *testing.T, b1, b2 *bytes.Buffer, filename string) {
|
||||
}
|
||||
|
||||
// the first and 2nd result should be identical
|
||||
if bytes.Compare(b1.Bytes(), b2.Bytes()) != 0 {
|
||||
if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
|
||||
t.Errorf("gofmt %s not idempotent", filename)
|
||||
}
|
||||
}
|
||||
|
@ -748,7 +748,7 @@ func testReadLineNewlines(t *testing.T, input string, expect []readLineResult) {
|
||||
b := NewReaderSize(strings.NewReader(input), minReadBufferSize)
|
||||
for i, e := range expect {
|
||||
line, isPrefix, err := b.ReadLine()
|
||||
if bytes.Compare(line, e.line) != 0 {
|
||||
if !bytes.Equal(line, e.line) {
|
||||
t.Errorf("%q call %d, line == %q, want %q", input, i, line, e.line)
|
||||
return
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ func TestDecryptPKCS1v15(t *testing.T) {
|
||||
t.Errorf("#%d error decrypting", i)
|
||||
}
|
||||
want := []byte(test.out)
|
||||
if bytes.Compare(out, want) != 0 {
|
||||
if !bytes.Equal(out, want) {
|
||||
t.Errorf("#%d got:%#v want:%#v", i, out, want)
|
||||
}
|
||||
}
|
||||
@ -90,7 +90,7 @@ func TestEncryptPKCS1v15(t *testing.T) {
|
||||
return false
|
||||
}
|
||||
|
||||
if bytes.Compare(plaintext, in) != 0 {
|
||||
if !bytes.Equal(plaintext, in) {
|
||||
t.Errorf("output mismatch: %#v %#v", plaintext, in)
|
||||
return false
|
||||
}
|
||||
@ -132,7 +132,7 @@ func TestEncryptPKCS1v15SessionKey(t *testing.T) {
|
||||
t.Errorf("#%d error decrypting", i)
|
||||
}
|
||||
want := []byte(test.out)
|
||||
if bytes.Compare(key, want) != 0 {
|
||||
if !bytes.Equal(key, want) {
|
||||
t.Errorf("#%d got:%#v want:%#v", i, key, want)
|
||||
}
|
||||
}
|
||||
@ -176,7 +176,7 @@ func TestSignPKCS1v15(t *testing.T) {
|
||||
}
|
||||
|
||||
expected, _ := hex.DecodeString(test.out)
|
||||
if bytes.Compare(s, expected) != 0 {
|
||||
if !bytes.Equal(s, expected) {
|
||||
t.Errorf("#%d got: %x want: %x", i, s, expected)
|
||||
}
|
||||
}
|
||||
|
@ -179,7 +179,7 @@ func TestEncryptOAEP(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Errorf("#%d,%d error: %s", i, j, err)
|
||||
}
|
||||
if bytes.Compare(out, message.out) != 0 {
|
||||
if !bytes.Equal(out, message.out) {
|
||||
t.Errorf("#%d,%d bad result: %x (want %x)", i, j, out, message.out)
|
||||
}
|
||||
}
|
||||
@ -203,7 +203,7 @@ func TestDecryptOAEP(t *testing.T) {
|
||||
out, err := DecryptOAEP(sha1, nil, private, message.out, nil)
|
||||
if err != nil {
|
||||
t.Errorf("#%d,%d error: %s", i, j, err)
|
||||
} else if bytes.Compare(out, message.in) != 0 {
|
||||
} else if !bytes.Equal(out, message.in) {
|
||||
t.Errorf("#%d,%d bad result: %#v (want %#v)", i, j, out, message.in)
|
||||
}
|
||||
|
||||
@ -211,7 +211,7 @@ func TestDecryptOAEP(t *testing.T) {
|
||||
out, err = DecryptOAEP(sha1, random, private, message.out, nil)
|
||||
if err != nil {
|
||||
t.Errorf("#%d,%d (blind) error: %s", i, j, err)
|
||||
} else if bytes.Compare(out, message.in) != 0 {
|
||||
} else if !bytes.Equal(out, message.in) {
|
||||
t.Errorf("#%d,%d (blind) bad result: %#v (want %#v)", i, j, out, message.in)
|
||||
}
|
||||
}
|
||||
|
@ -124,7 +124,7 @@ func TestBitString(t *testing.T) {
|
||||
t.Errorf("#%d: Incorrect error result (did fail? %v, expected: %v)", i, err == nil, test.ok)
|
||||
}
|
||||
if err == nil {
|
||||
if test.bitLength != ret.BitLength || bytes.Compare(ret.Bytes, test.out) != 0 {
|
||||
if test.bitLength != ret.BitLength || !bytes.Equal(ret.Bytes, test.out) {
|
||||
t.Errorf("#%d: Bad result: %v (expected %v %v)", i, ret, test.out, test.bitLength)
|
||||
}
|
||||
}
|
||||
@ -166,7 +166,7 @@ func TestBitStringRightAlign(t *testing.T) {
|
||||
for i, test := range bitStringRightAlignTests {
|
||||
bs := BitString{test.in, test.inlen}
|
||||
out := bs.RightAlign()
|
||||
if bytes.Compare(out, test.out) != 0 {
|
||||
if !bytes.Equal(out, test.out) {
|
||||
t.Errorf("#%d got: %x want: %x", i, out, test.out)
|
||||
}
|
||||
}
|
||||
@ -477,7 +477,7 @@ func TestRawStructs(t *testing.T) {
|
||||
if s.A != 0x50 {
|
||||
t.Errorf("bad value for A: got %d want %d", s.A, 0x50)
|
||||
}
|
||||
if bytes.Compare([]byte(s.Raw), input) != 0 {
|
||||
if !bytes.Equal([]byte(s.Raw), input) {
|
||||
t.Errorf("bad value for Raw: got %x want %x", s.Raw, input)
|
||||
}
|
||||
}
|
||||
|
@ -132,7 +132,7 @@ func TestMarshal(t *testing.T) {
|
||||
t.Errorf("#%d failed: %s", i, err)
|
||||
}
|
||||
out, _ := hex.DecodeString(test.out)
|
||||
if bytes.Compare(out, data) != 0 {
|
||||
if !bytes.Equal(out, data) {
|
||||
t.Errorf("#%d got: %x want %x\n\t%q\n\t%q", i, data, out, data, out)
|
||||
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ func TestDecodeString(t *testing.T) {
|
||||
t.Errorf("#%d: unexpected err value: %s", i, err)
|
||||
continue
|
||||
}
|
||||
if bytes.Compare(dst, test.dec) != 0 {
|
||||
if !bytes.Equal(dst, test.dec) {
|
||||
t.Errorf("#%d: got: %#v want: #%v", i, dst, test.dec)
|
||||
}
|
||||
}
|
||||
|
@ -422,7 +422,7 @@ func TestUnmarshalMarshal(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("Marshal: %v", err)
|
||||
}
|
||||
if bytes.Compare(jsonBig, b) != 0 {
|
||||
if !bytes.Equal(jsonBig, b) {
|
||||
t.Errorf("Marshal jsonBig")
|
||||
diff(t, b, jsonBig)
|
||||
return
|
||||
@ -474,7 +474,7 @@ func TestLargeByteSlice(t *testing.T) {
|
||||
if err := Unmarshal(b, &s1); err != nil {
|
||||
t.Fatalf("Unmarshal: %v", err)
|
||||
}
|
||||
if bytes.Compare(s0, s1) != 0 {
|
||||
if !bytes.Equal(s0, s1) {
|
||||
t.Errorf("Marshal large byte slice")
|
||||
diff(t, s0, s1)
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ func TestCompactBig(t *testing.T) {
|
||||
t.Fatalf("Compact: %v", err)
|
||||
}
|
||||
b := buf.Bytes()
|
||||
if bytes.Compare(b, jsonBig) != 0 {
|
||||
if !bytes.Equal(b, jsonBig) {
|
||||
t.Error("Compact(jsonBig) != jsonBig")
|
||||
diff(t, b, jsonBig)
|
||||
return
|
||||
@ -118,7 +118,7 @@ func TestIndentBig(t *testing.T) {
|
||||
t.Fatalf("Indent2: %v", err)
|
||||
}
|
||||
b1 := buf1.Bytes()
|
||||
if bytes.Compare(b1, b) != 0 {
|
||||
if !bytes.Equal(b1, b) {
|
||||
t.Error("Indent(Indent(jsonBig)) != Indent(jsonBig)")
|
||||
diff(t, b1, b)
|
||||
return
|
||||
@ -130,7 +130,7 @@ func TestIndentBig(t *testing.T) {
|
||||
t.Fatalf("Compact: %v", err)
|
||||
}
|
||||
b1 = buf1.Bytes()
|
||||
if bytes.Compare(b1, jsonBig) != 0 {
|
||||
if !bytes.Equal(b1, jsonBig) {
|
||||
t.Error("Compact(Indent(jsonBig)) != jsonBig")
|
||||
diff(t, b1, jsonBig)
|
||||
return
|
||||
|
@ -388,10 +388,10 @@ func TestKey(t *testing.T) {
|
||||
}
|
||||
// Separate generation from testing to ensure buffers are not overwritten.
|
||||
for i, tt := range keyTests {
|
||||
if bytes.Compare(keys1[i], tt.out) != 0 {
|
||||
if !bytes.Equal(keys1[i], tt.out) {
|
||||
t.Errorf("%d: Key(%q) = %d; want %d", i, tt.in, keys1[i], tt.out)
|
||||
}
|
||||
if bytes.Compare(keys2[i], tt.out) != 0 {
|
||||
if !bytes.Equal(keys2[i], tt.out) {
|
||||
t.Errorf("%d: KeyFromString(%q) = %d; want %d", i, tt.in, keys2[i], tt.out)
|
||||
}
|
||||
}
|
||||
|
@ -674,7 +674,7 @@ func testCollator(c *collate.Collator) {
|
||||
for _, str := range testInput.values() {
|
||||
k0 := c0.KeyFromString(&buf, str)
|
||||
k := c.KeyFromString(&buf, str)
|
||||
if bytes.Compare(k0, k) != 0 {
|
||||
if !bytes.Equal(k0, k) {
|
||||
failOnError(fmt.Errorf("test:%U: keys differ (%x vs %x)", []rune(str), k0, k))
|
||||
}
|
||||
buf.Reset()
|
||||
|
@ -123,7 +123,7 @@ func test(t *testing.T, mode Mode) {
|
||||
}
|
||||
|
||||
// compare
|
||||
if bytes.Compare(got, want) != 0 {
|
||||
if !bytes.Equal(got, want) {
|
||||
t.Errorf("package %s\n\tgot:\n%s\n\twant:\n%s", pkg.Name, got, want)
|
||||
}
|
||||
}
|
||||
|
@ -643,7 +643,7 @@ func TestSetBytes(t *testing.T) {
|
||||
|
||||
func checkBytes(b []byte) bool {
|
||||
b2 := new(Int).SetBytes(b).Bytes()
|
||||
return bytes.Compare(b, b2) == 0
|
||||
return bytes.Equal(b, b2)
|
||||
}
|
||||
|
||||
func TestBytes(t *testing.T) {
|
||||
|
Loading…
Reference in New Issue
Block a user