utter: code clean up

Remove dead code and simplify expressions.

dump.go

@@ -139,7 +139,7 @@ func (d *dumpState) dumpPtr(v reflect.Value) {
 		d.w.Write(openParenBytes)
 	}
 	typeBytes := []byte(v.Type().String())
-	d.w.Write(bytes.Replace(typeBytes, interfaceTypeBytes, interfaceBytes, -1))
+	d.w.Write(bytes.ReplaceAll(typeBytes, interfaceTypeBytes, interfaceBytes))
 	switch {
 	case bufferedChan:
 		switch len := v.Len(); len {
@@ -350,7 +350,7 @@ func (d *dumpState) dump(v reflect.Value, wasPtr, static bool, addr uintptr) {
 				d.w.Write(openParenBytes)
 			}
 			typeBytes := []byte(v.Type().String())
-			d.w.Write(bytes.Replace(typeBytes, interfaceTypeBytes, interfaceBytes, -1))
+			d.w.Write(bytes.ReplaceAll(typeBytes, interfaceTypeBytes, interfaceBytes))
 			if bufferedChan {
 				switch len := v.Len(); len {
 				case 0:

internal_test.go

@@ -38,10 +38,7 @@ type dummyFmtState struct {
 }
 
 func (dfs *dummyFmtState) Flag(f int) bool {
-	if f == int('+') {
-		return true
-	}
-	return false
+	return f == int('+')
 }
 
 func (dfs *dummyFmtState) Precision() (int, bool) {
@@ -69,7 +66,6 @@ func TestInvalidReflectValue(t *testing.T) {
 	if s != want {
 		t.Errorf("InvalidReflectValue #%d\n got: %s want: %s", i, s, want)
 	}
-	i++
 }
 
 // changeKind uses unsafe to intentionally change the kind of a reflect.Value to
@@ -114,7 +110,6 @@ func TestAddedReflectValue(t *testing.T) {
 	if s != want {
 		t.Errorf("TestAddedReflectValue #%d\n got: %s want: %s", i, s, want)
 	}
-	i++
 }
 
 // SortMapByKeyVals makes the internal sortMapByKeyVals function available

spew_test.go

@@ -20,8 +20,6 @@ package utter_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/kortschak/utter"
@@ -68,25 +66,6 @@ type utterTest struct {
 // tests are handled in the dump and format tests.
 var utterTests []utterTest
 
-// redirStdout is a helper function to return the standard output from f as a
-// byte slice.
-func redirStdout(f func()) ([]byte, error) {
-	tempFile, err := ioutil.TempFile("", "ss-test")
-	if err != nil {
-		return nil, err
-	}
-	fileName := tempFile.Name()
-	defer os.Remove(fileName) // Ignore error
-
-	origStdout := os.Stdout
-	os.Stdout = tempFile
-	f()
-	os.Stdout = origStdout
-	tempFile.Close()
-
-	return ioutil.ReadFile(fileName)
-}
-
 func initSpewTests() {
 	// Config states with various settings.
 	scsDefault := utter.NewDefaultConfig()
@@ -127,15 +106,6 @@ func initSpewTests() {
 	elideTypeDefault := utter.NewDefaultConfig()
 	elideTypeDefault.ElideType = true
 
-	// depthTester is used to test max depth handling for structs, array, slices
-	// and maps.
-	type depthTester struct {
-		ic    indirCir1
-		arr   [1]string
-		slice []string
-		m     map[string]int
-	}
-
 	var (
 		np  *int
 		nip = new(interface{})