format source tree using goimports

util/bytecounter/bytecounter_streamcopier_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"github.com/zrepl/zrepl/zfs"
 )
 

util/chainlock/chainlock.go

@@ -39,4 +39,4 @@ func (l *L) NewCond() *sync.Cond {
 func (l *L) DropWhile(f func()) {
 	defer l.Unlock().Lock()
 	f()
-}
+}

util/chunking_test.go

@@ -3,11 +3,12 @@ package util
 import (
 	"bytes"
 	"encoding/binary"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"reflect"
 	"testing"
 	"testing/quick"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUnchunker(t *testing.T) {

util/contextflexibletimeout_test.go

@@ -2,10 +2,11 @@ package util
 
 import (
 	"context"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestContextWithOptionalDeadline(t *testing.T) {

util/io.go

@@ -101,16 +101,16 @@ func (c *ChainedReader) Read(buf []byte) (n int, err error) {
 }
 
 type ByteCounterReader struct {
-	reader    io.ReadCloser
+	reader io.ReadCloser
 
 	// called & accessed synchronously during Read, no external access
-	cb        func(full int64)
-	cbEvery   time.Duration
-	lastCbAt  time.Time
+	cb               func(full int64)
+	cbEvery          time.Duration
+	lastCbAt         time.Time
 	bytesSinceLastCb int64
 
 	// set atomically because it may be read by multiple threads
-	bytes     int64
+	bytes int64
 }
 
 func NewByteCounterReader(reader io.ReadCloser) *ByteCounterReader {

util/iocommand.go

@@ -4,18 +4,19 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/zrepl/zrepl/util/envconst"
 	"io"
 	"os"
 	"os/exec"
 	"syscall"
 	"time"
+
+	"github.com/zrepl/zrepl/util/envconst"
 )
 
 // An IOCommand exposes a forked process's std(in|out|err) through the io.ReadWriteCloser interface.
 type IOCommand struct {
 	Cmd        *exec.Cmd
-	kill 	   context.CancelFunc
+	kill       context.CancelFunc
 	Stdin      io.WriteCloser
 	Stdout     io.ReadCloser
 	StderrBuf  *bytes.Buffer