1 files changed, 57 insertions, 55 deletions
diff --git a/src/pkg/encoding/hex/hex_test.go b/src/pkg/encoding/hex/hex_test.go
index d741e595a..a14c9d4f4 100644
--- a/src/pkg/encoding/hex/hex_test.go
+++ b/src/pkg/encoding/hex/hex_test.go
@@ -14,26 +14,26 @@ type encodeTest struct {
 }
 
 var encodeTests = []encodeTest{
-	encodeTest{[]byte{}, []byte{}},
-	encodeTest{[]byte{0x01}, []byte{'0', '1'}},
-	encodeTest{[]byte{0xff}, []byte{'f', 'f'}},
-	encodeTest{[]byte{0xff, 00}, []byte{'f', 'f', '0', '0'}},
-	encodeTest{[]byte{0}, []byte{'0', '0'}},
-	encodeTest{[]byte{1}, []byte{'0', '1'}},
-	encodeTest{[]byte{2}, []byte{'0', '2'}},
-	encodeTest{[]byte{3}, []byte{'0', '3'}},
-	encodeTest{[]byte{4}, []byte{'0', '4'}},
-	encodeTest{[]byte{5}, []byte{'0', '5'}},
-	encodeTest{[]byte{6}, []byte{'0', '6'}},
-	encodeTest{[]byte{7}, []byte{'0', '7'}},
-	encodeTest{[]byte{8}, []byte{'0', '8'}},
-	encodeTest{[]byte{9}, []byte{'0', '9'}},
-	encodeTest{[]byte{10}, []byte{'0', 'a'}},
-	encodeTest{[]byte{11}, []byte{'0', 'b'}},
-	encodeTest{[]byte{12}, []byte{'0', 'c'}},
-	encodeTest{[]byte{13}, []byte{'0', 'd'}},
-	encodeTest{[]byte{14}, []byte{'0', 'e'}},
-	encodeTest{[]byte{15}, []byte{'0', 'f'}},
+	{[]byte{}, []byte{}},
+	{[]byte{0x01}, []byte{'0', '1'}},
+	{[]byte{0xff}, []byte{'f', 'f'}},
+	{[]byte{0xff, 00}, []byte{'f', 'f', '0', '0'}},
+	{[]byte{0}, []byte{'0', '0'}},
+	{[]byte{1}, []byte{'0', '1'}},
+	{[]byte{2}, []byte{'0', '2'}},
+	{[]byte{3}, []byte{'0', '3'}},
+	{[]byte{4}, []byte{'0', '4'}},
+	{[]byte{5}, []byte{'0', '5'}},
+	{[]byte{6}, []byte{'0', '6'}},
+	{[]byte{7}, []byte{'0', '7'}},
+	{[]byte{8}, []byte{'0', '8'}},
+	{[]byte{9}, []byte{'0', '9'}},
+	{[]byte{10}, []byte{'0', 'a'}},
+	{[]byte{11}, []byte{'0', 'b'}},
+	{[]byte{12}, []byte{'0', 'c'}},
+	{[]byte{13}, []byte{'0', 'd'}},
+	{[]byte{14}, []byte{'0', 'e'}},
+	{[]byte{15}, []byte{'0', 'f'}},
 }
 
 func TestEncode(t *testing.T) {
@@ -55,31 +55,32 @@ type decodeTest struct {
 }
 
 var decodeTests = []decodeTest{
-	decodeTest{[]byte{}, []byte{}, true},
-	decodeTest{[]byte{'0'}, []byte{}, false},
-	decodeTest{[]byte{'0', 'g'}, []byte{}, false},
-	decodeTest{[]byte{'0', '0'}, []byte{0}, true},
-	decodeTest{[]byte{'0', '1'}, []byte{1}, true},
-	decodeTest{[]byte{'0', '2'}, []byte{2}, true},
-	decodeTest{[]byte{'0', '3'}, []byte{3}, true},
-	decodeTest{[]byte{'0', '4'}, []byte{4}, true},
-	decodeTest{[]byte{'0', '5'}, []byte{5}, true},
-	decodeTest{[]byte{'0', '6'}, []byte{6}, true},
-	decodeTest{[]byte{'0', '7'}, []byte{7}, true},
-	decodeTest{[]byte{'0', '8'}, []byte{8}, true},
-	decodeTest{[]byte{'0', '9'}, []byte{9}, true},
-	decodeTest{[]byte{'0', 'a'}, []byte{10}, true},
-	decodeTest{[]byte{'0', 'b'}, []byte{11}, true},
-	decodeTest{[]byte{'0', 'c'}, []byte{12}, true},
-	decodeTest{[]byte{'0', 'd'}, []byte{13}, true},
-	decodeTest{[]byte{'0', 'e'}, []byte{14}, true},
-	decodeTest{[]byte{'0', 'f'}, []byte{15}, true},
-	decodeTest{[]byte{'0', 'A'}, []byte{10}, true},
-	decodeTest{[]byte{'0', 'B'}, []byte{11}, true},
-	decodeTest{[]byte{'0', 'C'}, []byte{12}, true},
-	decodeTest{[]byte{'0', 'D'}, []byte{13}, true},
-	decodeTest{[]byte{'0', 'E'}, []byte{14}, true},
-	decodeTest{[]byte{'0', 'F'}, []byte{15}, true},
+	{[]byte{}, []byte{}, true},
+	{[]byte{'0'}, []byte{}, false},
+	{[]byte{'0', 'g'}, []byte{}, false},
+	{[]byte{'0', '\x01'}, []byte{}, false},
+	{[]byte{'0', '0'}, []byte{0}, true},
+	{[]byte{'0', '1'}, []byte{1}, true},
+	{[]byte{'0', '2'}, []byte{2}, true},
+	{[]byte{'0', '3'}, []byte{3}, true},
+	{[]byte{'0', '4'}, []byte{4}, true},
+	{[]byte{'0', '5'}, []byte{5}, true},
+	{[]byte{'0', '6'}, []byte{6}, true},
+	{[]byte{'0', '7'}, []byte{7}, true},
+	{[]byte{'0', '8'}, []byte{8}, true},
+	{[]byte{'0', '9'}, []byte{9}, true},
+	{[]byte{'0', 'a'}, []byte{10}, true},
+	{[]byte{'0', 'b'}, []byte{11}, true},
+	{[]byte{'0', 'c'}, []byte{12}, true},
+	{[]byte{'0', 'd'}, []byte{13}, true},
+	{[]byte{'0', 'e'}, []byte{14}, true},
+	{[]byte{'0', 'f'}, []byte{15}, true},
+	{[]byte{'0', 'A'}, []byte{10}, true},
+	{[]byte{'0', 'B'}, []byte{11}, true},
+	{[]byte{'0', 'C'}, []byte{12}, true},
+	{[]byte{'0', 'D'}, []byte{13}, true},
+	{[]byte{'0', 'E'}, []byte{14}, true},
+	{[]byte{'0', 'F'}, []byte{15}, true},
 }
 
 func TestDecode(t *testing.T) {
@@ -104,10 +105,10 @@ type encodeStringTest struct {
 }
 
 var encodeStringTests = []encodeStringTest{
-	encodeStringTest{[]byte{}, ""},
-	encodeStringTest{[]byte{0}, "00"},
-	encodeStringTest{[]byte{0, 1}, "0001"},
-	encodeStringTest{[]byte{0, 1, 255}, "0001ff"},
+	{[]byte{}, ""},
+	{[]byte{0}, "00"},
+	{[]byte{0, 1}, "0001"},
+	{[]byte{0, 1, 255}, "0001ff"},
 }
 
 func TestEncodeToString(t *testing.T) {
@@ -126,12 +127,13 @@ type decodeStringTest struct {
 }
 
 var decodeStringTests = []decodeStringTest{
-	decodeStringTest{"", []byte{}, true},
-	decodeStringTest{"0", []byte{}, false},
-	decodeStringTest{"00", []byte{0}, true},
-	decodeStringTest{"0g", []byte{}, false},
-	decodeStringTest{"00ff00", []byte{0, 255, 0}, true},
-	decodeStringTest{"0000ff", []byte{0, 0, 255}, true},
+	{"", []byte{}, true},
+	{"0", []byte{}, false},
+	{"00", []byte{0}, true},
+	{"0\x01", []byte{}, false},
+	{"0g", []byte{}, false},
+	{"00ff00", []byte{0, 255, 0}, true},
+	{"0000ff", []byte{0, 0, 255}, true},
 }
 
 func TestDecodeString(t *testing.T) {