Update linting and fix field alignment issues

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/internal/iohelpers/readers.go b/internal/iohelpers/readers.go
index 277d7ab9..090a44a0 100644
--- a/internal/iohelpers/readers.go
+++ b/internal/iohelpers/readers.go
@@ -15,11 +15,11 @@ func LazyReadCloser(open func() (io.ReadCloser, error)) io.ReadCloser {
 }
 
 type lazyReadCloser struct {
-	opened sync.Once
-	r      io.ReadCloser
+	r io.ReadCloser
 	// caches the error that came from open(), if any
 	openErr error
 	open    func() (io.ReadCloser, error)
+	opened  sync.Once
 }
 
 var _ io.ReadCloser = (*lazyReadCloser)(nil)
diff --git a/internal/iohelpers/writers.go b/internal/iohelpers/writers.go
index 59e7def7..5030d275 100644
--- a/internal/iohelpers/writers.go
+++ b/internal/iohelpers/writers.go
@@ -181,11 +181,11 @@ func LazyWriteCloser(open func() (io.WriteCloser, error)) io.WriteCloser {
 }
 
 type lazyWriteCloser struct {
-	opened sync.Once
-	w      io.WriteCloser
+	w io.WriteCloser
 	// caches the error that came from open(), if any
 	openErr error
 	open    func() (io.WriteCloser, error)
+	opened  sync.Once
 }
 
 var _ io.WriteCloser = (*lazyWriteCloser)(nil)