internal: avoid "if err = f(); err != nil" pattern

Use shadowing via ":=", which clearly signals we're not storing the
error value in a variable to be used at a later time. This way, one
knows that the error value is scoped to the if statement, so there is
less to keep in one's head.

Change-Id: Ibfb5efc92e9500a525ca58ad341d59ced0581fd9
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/238043
Reviewed-by: Julie Qiu <julie@golang.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/internal/database/database.go b/internal/database/database.go
index 48d0a606..4aa41afd 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -47,7 +47,7 @@ func Open(driverName, dbinfo string) (_ *DB, err error) {
 	if err != nil {
 		return nil, err
 	}
-	if err = db.Ping(); err != nil {
+	if err := db.Ping(); err != nil {
 		return nil, err
 	}
 	return New(db), nil
@@ -194,7 +194,7 @@ func (db *DB) transact(ctx context.Context, opts *sql.TxOptions, txFunc func(*DB
 		} else if err != nil {
 			tx.Rollback()
 		} else {
-			if err = tx.Commit(); err != nil {
+			if err := tx.Commit(); err != nil {
 				err = fmt.Errorf("tx.Commit(): %w", err)
 			}
 		}