mirror of
https://github.com/golang/go.git
synced 2025-10-19 19:13:18 +00:00
net/http: remove unused err parameter from cancel
Change-Id: I91f1b93298671bcb2aa5f86a59f5794bd3e3b2a9
GitHub-Last-Rev: f2e7ffb45f
GitHub-Pull-Request: golang/go#71911
Reviewed-on: https://go-review.googlesource.com/c/go/+/651220
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
Auto-Submit: Damien Neil <dneil@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
parent
3ff943fce0
commit
2ee775fd9b
1 changed files with 2 additions and 2 deletions
|
@ -1358,7 +1358,7 @@ func (w *wantConn) tryDeliver(pc *persistConn, err error, idleAt time.Time) bool
|
||||||
|
|
||||||
// cancel marks w as no longer wanting a result (for example, due to cancellation).
|
// cancel marks w as no longer wanting a result (for example, due to cancellation).
|
||||||
// If a connection has been delivered already, cancel returns it with t.putOrCloseIdleConn.
|
// If a connection has been delivered already, cancel returns it with t.putOrCloseIdleConn.
|
||||||
func (w *wantConn) cancel(t *Transport, err error) {
|
func (w *wantConn) cancel(t *Transport) {
|
||||||
w.mu.Lock()
|
w.mu.Lock()
|
||||||
var pc *persistConn
|
var pc *persistConn
|
||||||
if w.done {
|
if w.done {
|
||||||
|
@ -1507,7 +1507,7 @@ func (t *Transport) getConn(treq *transportRequest, cm connectMethod) (_ *persis
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
w.cancel(t, err)
|
w.cancel(t)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue