Merge pull request #265 from capnproto/cleanup/dead-code

Assorted clean-up tasks

capnpc-go/capnpc-go_test.go

@@ -118,8 +118,7 @@ func TestBuildNodeMap(t *testing.T) {
 			n := nodes[k]
 			if n == nil {
 				t.Errorf("%s: missing @%#x from node map", test.name, k)
-			}
-			if n.Id() != k {
+			} else if n.Id() != k {
 				t.Errorf("%s: node map has ID @%#x for lookup of @%#x", test.name, n.Id(), k)
 			}
 		}

encoding/text/marshal.go

@@ -113,15 +113,6 @@ func (enc *Encoder) marshalText(t []byte) {
 	enc.w.Write(enc.tmp)
 }
 
-func needsEscape(b byte) bool {
-	return b < 0x20 || b >= 0x7f
-}
-
-func hexDigit(b byte) byte {
-	const digits = "0123456789abcdef"
-	return digits[b]
-}
-
 func (enc *Encoder) marshalStruct(typeID uint64, s capnp.Struct) error {
 	n, err := enc.nodes.Find(typeID)
 	if err != nil {

message_test.go

@@ -14,6 +14,8 @@ import (
 )
 
 func TestNewMessage(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		arena Arena
 		fails bool
@@ -54,6 +56,8 @@ func TestNewMessage(t *testing.T) {
 }
 
 func TestAlloc(t *testing.T) {
+	t.Parallel()
+
 	type allocTest struct {
 		name string
 
@@ -167,6 +171,8 @@ func TestAlloc(t *testing.T) {
 }
 
 func TestSingleSegment(t *testing.T) {
+	t.Parallel()
+
 	// fresh arena
 	{
 		arena := SingleSegment(nil)
@@ -207,6 +213,8 @@ func TestSingleSegment(t *testing.T) {
 }
 
 func TestSingleSegmentAllocate(t *testing.T) {
+	t.Parallel()
+
 	tests := []arenaAllocTest{
 		{
 			name: "empty arena",
@@ -274,6 +282,8 @@ func TestSingleSegmentAllocate(t *testing.T) {
 }
 
 func TestMultiSegment(t *testing.T) {
+	t.Parallel()
+
 	// fresh arena
 	{
 		arena := MultiSegment(nil)
@@ -314,6 +324,8 @@ func TestMultiSegment(t *testing.T) {
 }
 
 func TestMultiSegmentAllocate(t *testing.T) {
+	t.Parallel()
+
 	tests := []arenaAllocTest{
 		{
 			name: "empty arena",
@@ -515,6 +527,8 @@ var serializeTests = []serializeTest{
 }
 
 func TestMarshal(t *testing.T) {
+	t.Parallel()
+
 	for i, test := range serializeTests {
 		if test.decodeFails {
 			continue
@@ -538,6 +552,8 @@ func TestMarshal(t *testing.T) {
 }
 
 func TestUnmarshal(t *testing.T) {
+	t.Parallel()
+
 	for i, test := range serializeTests {
 		if test.encodeFails {
 			continue
@@ -598,6 +614,8 @@ func TestWriteTo(t *testing.T) {
 }
 
 func TestEncoder(t *testing.T) {
+	t.Parallel()
+
 	for i, test := range serializeTests {
 		if test.decodeFails {
 			continue
@@ -624,6 +642,8 @@ func TestEncoder(t *testing.T) {
 }
 
 func TestDecoder(t *testing.T) {
+	t.Parallel()
+
 	for i, test := range serializeTests {
 		if test.encodeFails {
 			continue
@@ -661,6 +681,7 @@ func TestDecoder(t *testing.T) {
 
 func TestDecoder_MaxMessageSize(t *testing.T) {
 	t.Parallel()
+
 	zeroWord := []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
 	tests := []struct {
 		name    string
@@ -745,6 +766,8 @@ func TestDecoder_MaxMessageSize(t *testing.T) {
 // zeroed. This was not done in previous versions and
 // resulted in the padding being garbage.
 func TestStreamHeaderPadding(t *testing.T) {
+	t.Parallel()
+
 	msg := &Message{
 		Arena: MultiSegment([][]byte{
 			incrementingData(8),
@@ -786,6 +809,8 @@ func TestStreamHeaderPadding(t *testing.T) {
 }
 
 func TestAddCap(t *testing.T) {
+	t.Parallel()
+
 	hook1 := new(dummyHook)
 	hook2 := new(dummyHook)
 	client1 := NewClient(hook1)
@@ -855,6 +880,8 @@ func TestAddCap(t *testing.T) {
 }
 
 func TestFirstSegmentMessage_SingleSegment(t *testing.T) {
+	t.Parallel()
+
 	msg, seg, err := NewMessage(SingleSegment(nil))
 	if err != nil {
 		t.Fatal(err)
@@ -876,6 +903,8 @@ func TestFirstSegmentMessage_SingleSegment(t *testing.T) {
 }
 
 func TestFirstSegmentMessage_MultiSegment(t *testing.T) {
+	t.Parallel()
+
 	msg, seg, err := NewMessage(MultiSegment(nil))
 	if err != nil {
 		t.Fatal(err)
@@ -897,6 +926,8 @@ func TestFirstSegmentMessage_MultiSegment(t *testing.T) {
 }
 
 func TestNextAlloc(t *testing.T) {
+	t.Parallel()
+
 	const max32 = 1<<31 - 8
 	const max64 = 1<<63 - 8
 	const is64bit = int64(maxInt) == math.MaxInt64
@@ -956,6 +987,8 @@ func TestNextAlloc(t *testing.T) {
 
 // Make sure Message.TotalSize() returns a value consistent with Message.Marshal()
 func TestTotalSize(t *testing.T) {
+	t.Parallel()
+
 	var emptyWord [8]byte
 	err := quick.Check(func(segs [][]byte) bool {
 		// Make sure there is at least one segment, and that all segments

packed/packed_test.go

@@ -252,6 +252,7 @@ var badDecompressionTests = []struct {
 
 func TestPack(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	for _, test := range compressionTests {
 		t.Run(test.name, func(t *testing.T) {
@@ -278,6 +279,7 @@ func TestPack_wordsize(t *testing.T) {
 
 func TestUnpack(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	var tests []testCase
 	tests = append(tests, compressionTests...)
@@ -301,6 +303,7 @@ func TestUnpack(t *testing.T) {
 
 func TestUnpack_Fail(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	for _, test := range badDecompressionTests {
 		t.Run(test.name, func(t *testing.T) {
@@ -314,6 +317,7 @@ func TestUnpack_Fail(t *testing.T) {
 
 func TestReader(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	var tests []testCase
 	tests = append(tests, compressionTests...)
@@ -344,6 +348,7 @@ func TestReader(t *testing.T) {
 
 func TestReader_DataErr(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	const readSize = 3
 	var tests []testCase
@@ -371,6 +376,7 @@ func TestReader_DataErr(t *testing.T) {
 
 func TestReader_Fail(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	for _, test := range badDecompressionTests {
 		t.Run(test.name, func(t *testing.T) {