From: Russ Cox <rsc@golang.org>
Date: Fri, 23 Oct 2020 00:55:38 +0000 (-0400)
Subject: cmd/go/internal/fsys: rewrite non-idiomatic if statements
X-Git-Tag: go1.16beta1~536
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a8e2966eb01f175c330f6669f838e83af2cb73e3;p=gostls13.git

cmd/go/internal/fsys: rewrite non-idiomatic if statements

https://golang.org/doc/effective_go.html#if

Change-Id: I4d868e05c7827638f45b3b06d8762f5a298d56f7
Reviewed-on: https://go-review.googlesource.com/c/go/+/264537
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
---

diff --git a/src/cmd/go/internal/fsys/fsys.go b/src/cmd/go/internal/fsys/fsys.go
index 814e323701..3275c3faf7 100644
--- a/src/cmd/go/internal/fsys/fsys.go
+++ b/src/cmd/go/internal/fsys/fsys.go
@@ -249,11 +249,11 @@ func readDir(dir string) ([]fs.FileInfo, error) {
 
 	if os.IsNotExist(err) {
 		return nil, err
-	} else if dirfi, staterr := os.Stat(dir); staterr == nil && !dirfi.IsDir() {
+	}
+	if dirfi, staterr := os.Stat(dir); staterr == nil && !dirfi.IsDir() {
 		return nil, &fs.PathError{Op: "ReadDir", Path: dir, Err: errNotDir}
-	} else {
-		return nil, err
 	}
+	return nil, err
 }
 
 // ReadDir provides a slice of fs.FileInfo entries corresponding
@@ -267,7 +267,8 @@ func ReadDir(dir string) ([]fs.FileInfo, error) {
 	dirNode := overlay[dir]
 	if dirNode == nil {
 		return readDir(dir)
-	} else if dirNode.isDeleted() {
+	}
+	if dirNode.isDeleted() {
 		return nil, &fs.PathError{Op: "ReadDir", Path: dir, Err: fs.ErrNotExist}
 	}
 	diskfis, err := readDir(dir)
@@ -331,17 +332,18 @@ func Open(path string) (*os.File, error) {
 			return nil, &fs.PathError{Op: "Open", Path: path, Err: errors.New("fsys.Open doesn't support opening directories yet")}
 		}
 		return os.Open(node.actualFilePath)
-	} else if parent, ok := parentIsOverlayFile(filepath.Dir(cpath)); ok {
+	}
+	if parent, ok := parentIsOverlayFile(filepath.Dir(cpath)); ok {
 		// The file is deleted explicitly in the Replace map,
 		// or implicitly because one of its parent directories was
 		// replaced by a file.
 		return nil, &fs.PathError{
 			Op:   "Open",
 			Path: path,
-			Err:  fmt.Errorf("file %s does not exist: parent directory %s is replaced by a file in overlay", path, parent)}
-	} else {
-		return os.Open(cpath)
+			Err:  fmt.Errorf("file %s does not exist: parent directory %s is replaced by a file in overlay", path, parent),
+		}
 	}
+	return os.Open(cpath)
 }
 
 // IsDirWithGoFiles reports whether dir is a directory containing Go files
@@ -350,7 +352,8 @@ func IsDirWithGoFiles(dir string) (bool, error) {
 	fis, err := ReadDir(dir)
 	if os.IsNotExist(err) || errors.Is(err, errNotDir) {
 		return false, nil
-	} else if err != nil {
+	}
+	if err != nil {
 		return false, err
 	}
 
@@ -377,7 +380,8 @@ func IsDirWithGoFiles(dir string) (bool, error) {
 		actualFilePath, _ := OverlayPath(filepath.Join(dir, fi.Name()))
 		if fi, err := os.Stat(actualFilePath); err == nil && fi.Mode().IsRegular() {
 			return true, nil
-		} else if err != nil && firstErr == nil {
+		}
+		if err != nil && firstErr == nil {
 			firstErr = err
 		}
 	}