Simplify removeEmptyPort function implementation

dxasu · web-flow · commit 647cf556a2ed · 2025-12-03T10:13:21.000+08:00
diff --git a/src/net/http/http.go b/src/net/http/http.go
@@ -113,8 +113,7 @@ func hasPort(s string) bool { return strings.LastIndex(s, ":") > strings.LastInd
 // removeEmptyPort strips the empty port in ":port" to ""
 // as mandated by RFC 3986 Section 6.2.3.
 func removeEmptyPort(host string) string {
-	host, _ = strings.CutSuffix(host, ":")
-	return host
+	return strings.TrimSuffix(host, ":")
 }
 
 // isToken reports whether v is a valid token (https://www.rfc-editor.org/rfc/rfc2616#section-2.2).

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,7 @@ func hasPort(s string) bool { return strings.LastIndex(s, ":") > strings.LastInd`
`113`	`113`	`// removeEmptyPort strips the empty port in ":port" to ""`
`114`	`114`	`// as mandated by RFC 3986 Section 6.2.3.`
`115`	`115`	`func removeEmptyPort(host string) string {`
`116`		`- host, _ = strings.CutSuffix(host, ":")`
`117`		`- return host`
	`116`	`+ return strings.TrimSuffix(host, ":")`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`// isToken reports whether v is a valid token (https://www.rfc-editor.org/rfc/rfc2616#section-2.2).`