From: Shang Ding <sding3@ncsu.edu>
Date: Thu, 24 Feb 2022 01:35:21 +0000 (-0600)
Subject: net: clean up redundant if branch in dial
X-Git-Tag: go1.19beta1~854
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ebe624dd30f7be1479a2224b60a0da1b152ec851;p=gostls13.git

net: clean up redundant if branch in dial

Dialer.DialContext no longer performs a redundant check on the length
of the fallback slice, because dialParallel already handles the
situation where the fallback slice is empty or nil.

Change-Id: Ibb16f4813fc55dec2939c54c10e665ff35bfe163
Reviewed-on: https://go-review.googlesource.com/c/go/+/387795
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
---

diff --git a/src/net/dial.go b/src/net/dial.go
index 486ced0f2a..9159e6b384 100644
--- a/src/net/dial.go
+++ b/src/net/dial.go
@@ -421,12 +421,7 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (Conn
 		primaries = addrs
 	}
 
-	var c Conn
-	if len(fallbacks) > 0 {
-		c, err = sd.dialParallel(ctx, primaries, fallbacks)
-	} else {
-		c, err = sd.dialSerial(ctx, primaries)
-	}
+	c, err := sd.dialParallel(ctx, primaries, fallbacks)
 	if err != nil {
 		return nil, err
 	}