go/types, types2: follow-up on comment in CL 615195

Restate deferred call for readability.

Change-Id: I3725535b18fa4f1887e6c1976f8784e092b8f965
Reviewed-on: https://go-review.googlesource.com/c/go/+/615535
Auto-Submit: Robert Griesemer <gri@google.com>
Reviewed-by: Tim King <taking@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Griesemer <gri@google.com>

diff --git a/src/cmd/compile/internal/types2/check_test.go b/src/cmd/compile/internal/types2/check_test.go
index 8f537f912099f5724fc69c231c87646f1f50e24f..35bbcec5c58d7c4c8666a8c30e689ffa9ec0b8ac 100644 (file)
--- a/src/cmd/compile/internal/types2/check_test.go
+++ b/src/cmd/compile/internal/types2/check_test.go
@@ -182,7 +182,8 @@ func testFilesImpl(t *testing.T, filenames []string, srcs [][]byte, colDelta uin
        }
 
        if goexperiment != "" {
-               defer setGOEXPERIMENT(goexperiment)()
+               revert := setGOEXPERIMENT(goexperiment)
+               defer revert()
        }
 
        // By default, gotypesalias is not set.
@@ -329,9 +330,7 @@ func setGOEXPERIMENT(goexperiment string) func() {
        }
        old := buildcfg.Experiment
        buildcfg.Experiment = *exp
-       return func() {
-               buildcfg.Experiment = old
-       }
+       return func() { buildcfg.Experiment = old }
 }
 
 // TestManual is for manual testing of a package - either provided

diff --git a/src/cmd/compile/internal/types2/object_test.go b/src/cmd/compile/internal/types2/object_test.go
index 429f463bf7054b7b5caf15156e76f333b3f3a671..955fa351a467dff0facf665b46f666f1734a75ed 100644 (file)
--- a/src/cmd/compile/internal/types2/object_test.go
+++ b/src/cmd/compile/internal/types2/object_test.go
@@ -115,7 +115,8 @@ func TestObjectString(t *testing.T) {
        for i, test := range testObjects {
                t.Run(fmt.Sprint(i), func(t *testing.T) {
                        if test.alias {
-                               defer setGOEXPERIMENT("aliastypeparams")()
+                               revert := setGOEXPERIMENT("aliastypeparams")
+                               defer revert()
                        }
                        src := "package p; " + test.src
                        conf := Config{Error: func(error) {}, Importer: defaultImporter(), EnableAlias: test.alias}

diff --git a/src/go/types/check_test.go b/src/go/types/check_test.go
index be55616974601ebcf2d71e1bfe44b7842910eaad..a10d0147da2c6516e6ee3c4f0444f343f97c9105 100644 (file)
--- a/src/go/types/check_test.go
+++ b/src/go/types/check_test.go
@@ -197,7 +197,8 @@ func testFilesImpl(t *testing.T, filenames []string, srcs [][]byte, manual bool,
        }
 
        if goexperiment != "" {
-               defer setGOEXPERIMENT(goexperiment)()
+               revert := setGOEXPERIMENT(goexperiment)
+               defer revert()
        }
 
        // By default, gotypesalias is not set.
@@ -357,9 +358,7 @@ func setGOEXPERIMENT(goexperiment string) func() {
        }
        old := buildcfg.Experiment
        buildcfg.Experiment = *exp
-       return func() {
-               buildcfg.Experiment = old
-       }
+       return func() { buildcfg.Experiment = old }
 }
 
 // TestManual is for manual testing of a package - either provided

diff --git a/src/go/types/object_test.go b/src/go/types/object_test.go
index 1a3f223e09f20627441e6cef69051b6b54f05b4c..704d4128ba86b3084baa07e253d3c5885edcfb54 100644 (file)
--- a/src/go/types/object_test.go
+++ b/src/go/types/object_test.go
@@ -115,7 +115,8 @@ func TestObjectString(t *testing.T) {
        for i, test := range testObjects {
                t.Run(fmt.Sprint(i), func(t *testing.T) {
                        if test.alias {
-                               defer setGOEXPERIMENT("aliastypeparams")()
+                               revert := setGOEXPERIMENT("aliastypeparams")
+                               defer revert()
                                t.Setenv("GODEBUG", "gotypesalias=1")
                        }