From e5514a24a6df91d2331212875763893fb8001cec Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Thu, 10 Aug 2017 21:39:16 -0700
Subject: [PATCH] pass gosimple

---
 cmd/bolt/main.go | 14 +++-----------
 tx.go            |  5 +----
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/cmd/bolt/main.go b/cmd/bolt/main.go
index 387ce06..682ba08 100644
--- a/cmd/bolt/main.go
+++ b/cmd/bolt/main.go
@@ -188,17 +188,9 @@ func (cmd *CheckCommand) Run(args ...string) error {
 	// Perform consistency check.
 	return db.View(func(tx *bolt.Tx) error {
 		var count int
-		ch := tx.Check()
-	loop:
-		for {
-			select {
-			case err, ok := <-ch:
-				if !ok {
-					break loop
-				}
-				fmt.Fprintln(cmd.Stdout, err)
-				count++
-			}
+		for err := range tx.Check() {
+			fmt.Fprintln(cmd.Stdout, err)
+			count++
 		}
 
 		// Print summary of errors.
diff --git a/tx.go b/tx.go
index 6b2fa28..57c4d5a 100644
--- a/tx.go
+++ b/tx.go
@@ -126,10 +126,7 @@ func (tx *Tx) DeleteBucket(name []byte) error {
 // the error is returned to the caller.
 func (tx *Tx) ForEach(fn func(name []byte, b *Bucket) error) error {
 	return tx.root.ForEach(func(k, v []byte) error {
-		if err := fn(k, tx.root.Bucket(k)); err != nil {
-			return err
-		}
-		return nil
+		return fn(k, tx.root.Bucket(k))
 	})
 }