all: use a more straightforward return value

Change-Id: I27e86c221da7f541c4823f501801e02942c9a829
Reviewed-on: https://go-review.googlesource.com/c/go/+/649935
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/cmd/compile/internal/inline/inlheur/dumpscores_test.go b/src/cmd/compile/internal/inline/inlheur/dumpscores_test.go
index 438b70096f2a3dbd4fe8162407980b07ddb6b910..2e1bcf98f980218a5d44af9564999e97a7a92d9a 100644 (file)
--- a/src/cmd/compile/internal/inline/inlheur/dumpscores_test.go
+++ b/src/cmd/compile/internal/inline/inlheur/dumpscores_test.go
@@ -105,5 +105,5 @@ func gatherInlCallSitesScoresForFile(t *testing.T, testcase string, td string) (
        if err := os.WriteFile(dumpfile, out, 0666); err != nil {
                return "", err
        }
-       return dumpfile, err
+       return dumpfile, nil
 }

diff --git a/src/cmd/go/internal/modload/buildlist.go b/src/cmd/go/internal/modload/buildlist.go
index 9db348c0983e5a5b9bec5c5c6a39227ed99613a6..eefc0083c93ddb61cbefc020deee8918a084f522 100644 (file)
--- a/src/cmd/go/internal/modload/buildlist.go
+++ b/src/cmd/go/internal/modload/buildlist.go
@@ -590,7 +590,7 @@ func LoadModGraph(ctx context.Context, goVersion string) (*ModuleGraph, error) {
                return nil, err
        }
        requirements = rs
-       return mg, err
+       return mg, nil
 }
 
 // expandGraph loads the complete module graph from rs.
@@ -655,7 +655,7 @@ func EditBuildList(ctx context.Context, add, mustSelect []module.Version) (chang
                return false, err
        }
        requirements = rs
-       return changed, err
+       return changed, nil
 }
 
 // OverrideRoots edits the global requirement roots by replacing the specific module versions.

diff --git a/src/compress/flate/deflate.go b/src/compress/flate/deflate.go
index 3d8728ead9c5451218faab90c0b0701eab89c045..aa8e08861525ddba116710daccded6a8c02c86e9 100644 (file)
--- a/src/compress/flate/deflate.go
+++ b/src/compress/flate/deflate.go
@@ -681,7 +681,7 @@ func NewWriterDict(w io.Writer, level int, dict []byte) (*Writer, error) {
        }
        zw.d.fillWindow(dict)
        zw.dict = append(zw.dict, dict...) // duplicate dictionary for Reset method.
-       return zw, err
+       return zw, nil
 }
 
 type dictWriter struct {

diff --git a/src/crypto/x509/parser.go b/src/crypto/x509/parser.go
index 88d91146257059469d4cf1afd3c4fe66cb6de55e..6bea5cc77b7fc59a17fb4a77042338cbff2efee3 100644 (file)
--- a/src/crypto/x509/parser.go
+++ b/src/crypto/x509/parser.go
@@ -1078,7 +1078,7 @@ func ParseCertificate(der []byte) (*Certificate, error) {
        if len(der) != len(cert.Raw) {
                return nil, errors.New("x509: trailing data")
        }
-       return cert, err
+       return cert, nil
 }
 
 // ParseCertificates parses one or more certificates from the given ASN.1 DER

diff --git a/src/internal/syscall/unix/faccessat_bsd.go b/src/internal/syscall/unix/faccessat_bsd.go
index 78fca18e27b3dc1873fbf2a712e1a36c42cb7ed8..1db54c35b26ac5482b375c13f5571ca864491080 100644 (file)
--- a/src/internal/syscall/unix/faccessat_bsd.go
+++ b/src/internal/syscall/unix/faccessat_bsd.go
@@ -20,5 +20,5 @@ func faccessat(dirfd int, path string, mode uint32, flags int) error {
        if errno != 0 {
                return errno
        }
-       return err
+       return nil
 }

diff --git a/src/internal/syscall/unix/faccessat_openbsd.go b/src/internal/syscall/unix/faccessat_openbsd.go
index 9d4ed9729120325540ddb9e91552a252e11736e0..3519532154a75de52a7e5b66e5c04b905fe22177 100644 (file)
--- a/src/internal/syscall/unix/faccessat_openbsd.go
+++ b/src/internal/syscall/unix/faccessat_openbsd.go
@@ -28,5 +28,5 @@ func faccessat(dirfd int, path string, mode uint32, flags int) error {
        if errno != 0 {
                return errno
        }
-       return err
+       return nil
 }

diff --git a/src/log/syslog/syslog.go b/src/log/syslog/syslog.go
index 362dd950ba29b08b9432e5003dee74d31489dc84..a7fa674db91e7366bc3de0a1f651af3aec5faa83 100644 (file)
--- a/src/log/syslog/syslog.go
+++ b/src/log/syslog/syslog.go
@@ -140,7 +140,7 @@ func Dial(network, raddr string, priority Priority, tag string) (*Writer, error)
        if err != nil {
                return nil, err
        }
-       return w, err
+       return w, nil
 }
 
 // connect makes a connection to the syslog server.

diff --git a/src/net/http/example_filesystem_test.go b/src/net/http/example_filesystem_test.go
index ebcb994f436f10d38c150a4748b5bc247a913c5a..da1f0df8902f4d32cc5724503397edfb28cfbfa1 100644 (file)
--- a/src/net/http/example_filesystem_test.go
+++ b/src/net/http/example_filesystem_test.go
@@ -65,7 +65,7 @@ func (fsys dotFileHidingFileSystem) Open(name string) (http.File, error) {
        if err != nil {
                return nil, err
        }
-       return dotFileHidingFile{file}, err
+       return dotFileHidingFile{file}, nil
 }
 
 func ExampleFileServer_dotFileHiding() {

diff --git a/src/net/http/request.go b/src/net/http/request.go
index 434c1640f3941dadefa6cb4aafb0d98a863066e3..cd254292e2a95fee998e16145d52999a216500e9 100644 (file)
--- a/src/net/http/request.go
+++ b/src/net/http/request.go
@@ -1062,7 +1062,7 @@ func ReadRequest(b *bufio.Reader) (*Request, error) {
        }
 
        delete(req.Header, "Host")
-       return req, err
+       return req, nil
 }
 
 // readRequest should be an internal detail,

diff --git a/src/net/rpc/jsonrpc/client.go b/src/net/rpc/jsonrpc/client.go
index 1beba0f364a5715ae57cc60306f9ada7fda2c0d1..c0f383445dfb88a353bf130215b21055c383ae77 100644 (file)
--- a/src/net/rpc/jsonrpc/client.go
+++ b/src/net/rpc/jsonrpc/client.go
@@ -120,5 +120,5 @@ func Dial(network, address string) (*rpc.Client, error) {
        if err != nil {
                return nil, err
        }
-       return NewClient(conn), err
+       return NewClient(conn), nil
 }

diff --git a/src/os/stat_windows.go b/src/os/stat_windows.go
index 160a3893ce56f139cc955133a3a391a7e23c569c..d2c2017a6504048c3aa33798658acf42e2ab5e7a 100644 (file)
--- a/src/os/stat_windows.go
+++ b/src/os/stat_windows.go
@@ -115,7 +115,7 @@ func statHandle(name string, h syscall.Handle) (FileInfo, error) {
                return nil, err
        }
        fs.filetype = ft
-       return fs, err
+       return fs, nil
 }
 
 // statNolog implements Stat for Windows.

diff --git a/src/os/user/cgo_lookup_unix.go b/src/os/user/cgo_lookup_unix.go
index 458d8cd453ac3a2ed2e4c1606d6f47fc09b9a647..1c9a289672133a878ceea26a783ed025f0088ab4 100644 (file)
--- a/src/os/user/cgo_lookup_unix.go
+++ b/src/os/user/cgo_lookup_unix.go
@@ -37,7 +37,7 @@ func lookupUser(username string) (*User, error) {
        if err != nil {
                return nil, fmt.Errorf("user: lookup username %s: %v", username, err)
        }
-       return buildUser(&pwd), err
+       return buildUser(&pwd), nil
 }
 
 func lookupUserId(uid string) (*User, error) {