errors: omit redundant nil check in type assertion for Join

When ok is true, err can't be nil.

Make it behave more like the Unwrap function.

Change-Id: Ieba5de57d60f5ff4d6a3468d703e6f72be02a97d
GitHub-Last-Rev: 6df9365a1d586bba64df57be11f9ca7b772cc773
GitHub-Pull-Request: golang/go#74764
Reviewed-on: https://go-review.googlesource.com/c/go/+/689920
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Jorropo <jorropo.pgm@gmail.com>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Mark Freeman <mark@golang.org>
Reviewed-by: Jorropo <jorropo.pgm@gmail.com>

diff --git a/src/errors/join.go b/src/errors/join.go
index dd50089c293f7ce5f516b07838d2988c4a58022f..d0a1bc298eb4c40180146dde15b9d987bfde06d9 100644 (file)
--- a/src/errors/join.go
+++ b/src/errors/join.go
@@ -28,12 +28,10 @@ func Join(errs ...error) error {
        }
        if n == 1 {
                for _, err := range errs {
-                       if err != nil {
-                               if _, ok := err.(interface {
-                                       Unwrap() []error
-                               }); ok {
-                                       return err
-                               }
+                       if _, ok := err.(interface {
+                               Unwrap() []error
+                       }); ok {
+                               return err
                        }
                }
        }