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>

6 files changed, 7 insertions, 7 deletions

diff --git a/internal/config/config.go b/internal/config/config.go
index 5c4c252e..cd837fec 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -58,7 +58,7 @@ func ValidateAppVersion(appVersion string) error {
 		if len(appVersion) > len(altDateFormat) {
 			appVersion = appVersion[:len(altDateFormat)]
 		}
-		if _, err = time.Parse(altDateFormat, appVersion); err != nil {
+		if _, err := time.Parse(altDateFormat, appVersion); err != nil {
 			return fmt.Errorf("app version %q does not match time formats %q or %q: %v",
 				appVersion, AppVersionFormat, altDateFormat, err)
 		}
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)
 			}
 		}
diff --git a/internal/fetch/internal/doc/testdata/testing.go b/internal/fetch/internal/doc/testdata/testing.go
index 52810f7a..bcf0a716 100644
--- a/internal/fetch/internal/doc/testdata/testing.go
+++ b/internal/fetch/internal/doc/testdata/testing.go
@@ -360,7 +360,7 @@ func after() {
 			fmt.Fprintf(os.Stderr, "testing: %s", err)
 			return
 		}
-		if err = pprof.WriteHeapProfile(f); err != nil {
+		if err := pprof.WriteHeapProfile(f); err != nil {
 			fmt.Fprintf(os.Stderr, "testing: can't write %s: %s", *memProfile, err)
 		}
 		f.Close()
diff --git a/internal/frontend/package.go b/internal/frontend/package.go
index f7ba3879..ff58e95c 100644
--- a/internal/frontend/package.go
+++ b/internal/frontend/package.go
@@ -162,7 +162,7 @@ func (s *Server) servePackagePageNew(w http.ResponseWriter, r *http.Request, ful
 		}
 		// We couldn't find a path at the given version, but if there's one at the latest version
 		// we can provide a link to it.
-		if _, _, _, err = s.ds.GetPathInfo(ctx, fullPath, inModulePath, internal.LatestVersion); err != nil {
+		if _, _, _, err := s.ds.GetPathInfo(ctx, fullPath, inModulePath, internal.LatestVersion); err != nil {
 			if errors.Is(err, derrors.NotFound) {
 				return pathNotFoundError(ctx, "package", fullPath, inVersion)
 			}
diff --git a/internal/postgres/version_map_test.go b/internal/postgres/version_map_test.go
index 68f1381b..20cc9911 100644
--- a/internal/postgres/version_map_test.go
+++ b/internal/postgres/version_map_test.go
@@ -34,7 +34,7 @@ func TestReadAndWriteVersionMap(t *testing.T) {
 		ResolvedVersion:  "v1.0.0",
 		Status:           200,
 	}
-	if err = testDB.UpsertVersionMap(ctx, vm); err != nil {
+	if err := testDB.UpsertVersionMap(ctx, vm); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/internal/teeproxy/teeproxy.go b/internal/teeproxy/teeproxy.go
index c6a937b1..78509449 100644
--- a/internal/teeproxy/teeproxy.go
+++ b/internal/teeproxy/teeproxy.go
@@ -137,7 +137,7 @@ func getGddoEvent(r *http.Request) (gddoEvent *RequestEvent, err error) {
 		return nil, err
 	}
 	gddoEvent = &RequestEvent{}
-	if err = json.Unmarshal(body, gddoEvent); err != nil {
+	if err := json.Unmarshal(body, gddoEvent); err != nil {
 		return nil, err
 	}
 	return gddoEvent, nil