gofmt cleanups.

ahash/ahash.go

@@ -56,7 +56,7 @@ var sliceFunctions = map[string]func([]byte) []byte{
 type Hash struct {
 	hash.Hash
 	secure bool
-	algo string
+	algo   string
 }
 
 // HashAlgo returns the name of the underlying hash algorithm.
@@ -127,19 +127,19 @@ var secureHashes = map[string]func() hash.Hash{
 	"blake2b-512": blakeFunc(blake2b.New512),
 }
 
-func newHash32(f func () hash.Hash32) func () hash.Hash {
+func newHash32(f func() hash.Hash32) func() hash.Hash {
 	return func() hash.Hash {
 		return f()
 	}
 }
 
-func newHash64(f func () hash.Hash64) func () hash.Hash {
+func newHash64(f func() hash.Hash64) func() hash.Hash {
 	return func() hash.Hash {
 		return f()
 	}
 }
 
-func newCRC64(tab uint64) func () hash.Hash {
+func newCRC64(tab uint64) func() hash.Hash {
 	return newHash64(
 		func() hash.Hash64 {
 			return crc64.New(crc64.MakeTable(tab))

ahash/ahash_test.go

@@ -12,10 +12,10 @@ func TestSecureHash(t *testing.T) {
 	algo := "sha256"
 	h, err := New(algo)
 	assert.NoErrorT(t, err)
-	assert.BoolT(t, h.IsSecure(), algo + " should be a secure hash")
+	assert.BoolT(t, h.IsSecure(), algo+" should be a secure hash")
 	assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
-	assert.BoolT(t, !h.IsHash32(), algo + " isn't actually a 32-bit hash")
+	assert.BoolT(t, !h.IsHash32(), algo+" isn't actually a 32-bit hash")
-	assert.BoolT(t, !h.IsHash64(), algo + " isn't actually a 64-bit hash")
+	assert.BoolT(t, !h.IsHash64(), algo+" isn't actually a 64-bit hash")
 
 	var data []byte
 	var expected = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -42,10 +42,10 @@ func TestInsecureHash(t *testing.T) {
 	algo := "md5"
 	h, err := New(algo)
 	assert.NoErrorT(t, err)
-	assert.BoolT(t, !h.IsSecure(), algo + " shouldn't be a secure hash")
+	assert.BoolT(t, !h.IsSecure(), algo+" shouldn't be a secure hash")
 	assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
-	assert.BoolT(t, !h.IsHash32(), algo + " isn't actually a 32-bit hash")
+	assert.BoolT(t, !h.IsHash32(), algo+" isn't actually a 32-bit hash")
-	assert.BoolT(t, !h.IsHash64(), algo + " isn't actually a 64-bit hash")
+	assert.BoolT(t, !h.IsHash64(), algo+" isn't actually a 64-bit hash")
 
 	var data []byte
 	var expected = "d41d8cd98f00b204e9800998ecf8427e"
@@ -72,31 +72,31 @@ func TestHash32(t *testing.T) {
 	algo := "crc32-ieee"
 	h, err := New(algo)
 	assert.NoErrorT(t, err)
-	assert.BoolT(t, !h.IsSecure(), algo + " shouldn't be a secure hash")
+	assert.BoolT(t, !h.IsSecure(), algo+" shouldn't be a secure hash")
 	assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
-	assert.BoolT(t, h.IsHash32(), algo + " is actually a 32-bit hash")
+	assert.BoolT(t, h.IsHash32(), algo+" is actually a 32-bit hash")
-	assert.BoolT(t, !h.IsHash64(), algo + " isn't actually a 64-bit hash")
+	assert.BoolT(t, !h.IsHash64(), algo+" isn't actually a 64-bit hash")
 
 	var data []byte
 	var expected uint32
 
 	h.Write(data)
 	sum, ok := h.Sum32()
-	assert.BoolT(t, ok, algo + " should be able to return a Sum32")
+	assert.BoolT(t, ok, algo+" should be able to return a Sum32")
 	assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
 
 	data = []byte("hello, world")
 	expected = 0xffab723a
 	h.Write(data)
 	sum, ok = h.Sum32()
-	assert.BoolT(t, ok, algo + " should be able to return a Sum32")
+	assert.BoolT(t, ok, algo+" should be able to return a Sum32")
 	assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
 
 	h.Reset()
 	data = []byte("hello world")
 	h.Write(data)
 	sum, ok = h.Sum32()
-	assert.BoolT(t, ok, algo + " should be able to return a Sum32")
+	assert.BoolT(t, ok, algo+" should be able to return a Sum32")
 	assert.BoolT(t, expected != sum, fmt.Sprintf("%s returned %d but shouldn't have", algo, sum, expected))
 }
 
@@ -104,31 +104,31 @@ func TestHash64(t *testing.T) {
 	algo := "crc64"
 	h, err := New(algo)
 	assert.NoErrorT(t, err)
-	assert.BoolT(t, !h.IsSecure(), algo + " shouldn't be a secure hash")
+	assert.BoolT(t, !h.IsSecure(), algo+" shouldn't be a secure hash")
 	assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
-	assert.BoolT(t, h.IsHash64(), algo + " is actually a 64-bit hash")
+	assert.BoolT(t, h.IsHash64(), algo+" is actually a 64-bit hash")
-	assert.BoolT(t, !h.IsHash32(), algo + " isn't actually a 32-bit hash")
+	assert.BoolT(t, !h.IsHash32(), algo+" isn't actually a 32-bit hash")
 
 	var data []byte
 	var expected uint64
 
 	h.Write(data)
 	sum, ok := h.Sum64()
-	assert.BoolT(t, ok, algo + " should be able to return a Sum64")
+	assert.BoolT(t, ok, algo+" should be able to return a Sum64")
 	assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
 
 	data = []byte("hello, world")
 	expected = 0x16c45c0eb1d9c2ec
 	h.Write(data)
 	sum, ok = h.Sum64()
-	assert.BoolT(t, ok, algo + " should be able to return a Sum64")
+	assert.BoolT(t, ok, algo+" should be able to return a Sum64")
 	assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
 
 	h.Reset()
 	data = []byte("hello world")
 	h.Write(data)
 	sum, ok = h.Sum64()
-	assert.BoolT(t, ok, algo + " should be able to return a Sum64")
+	assert.BoolT(t, ok, algo+" should be able to return a Sum64")
 	assert.BoolT(t, expected != sum, fmt.Sprintf("%s returned %d but shouldn't have", algo, sum, expected))
 }
 
@@ -137,5 +137,5 @@ func TestListLengthSanity(t *testing.T) {
 	secure := SecureHashList()
 	insecure := InsecureHashList()
 
-	assert.BoolT(t, len(all) == len(secure) + len(insecure))
+	assert.BoolT(t, len(all) == len(secure)+len(insecure))
 }

cmd/cruntar/main.go

@@ -16,8 +16,8 @@ import (
 
 var (
 	preserveOwners bool
-	preserveMode bool
+	preserveMode   bool
-	verbose bool
+	verbose        bool
 )
 
 func setupFile(hdr *tar.Header, file *os.File) error {

cmd/renfnv/renfnv.go

@@ -92,7 +92,7 @@ Options:
 }
 
 func init() {
-	flag.Usage = func () { usage(os.Stdout) }
+	flag.Usage = func() { usage(os.Stdout) }
 }
 
 func main() {

mwc/mwc_test.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/kisom/goutils/testio"
 	"github.com/kisom/goutils/assert"
+	"github.com/kisom/goutils/testio"
 )
 
 func TestMWC(t *testing.T) {

tee/tee.go

@@ -7,7 +7,7 @@ import (
 
 // Tee emulates the Unix tee(1) command.
 type Tee struct {
-	f *os.File
+	f       *os.File
 	Verbose bool
 }
 
@@ -36,13 +36,12 @@ func NewOut(logFile string) (*Tee, error) {
 	}
 
 	f, err := os.Create(logFile)
-	if err !=nil {
+	if err != nil {
 		return nil, err
 	}
 	return &Tee{f: f}, nil
 }
 
-
 // Printf formats according to a format specifier and writes to the
 // tee instance.
 func (t *Tee) Printf(format string, args ...interface{}) (int, error) {
@@ -73,7 +72,7 @@ var globalTee = &Tee{}
 // Open will attempt to open the logFile for the global tee instance.
 func Open(logFile string) error {
 	f, err := os.Create(logFile)
-	if err !=nil {
+	if err != nil {
 		return err
 	}
 	globalTee.f = f