From e16a32cd225a275f73d236bcb33703986d110ded Mon Sep 17 00:00:00 2001 From: Naman Gera Date: Fri, 9 Apr 2021 09:13:42 +0530 Subject: [PATCH] revert changes from generated files --- src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go | 2 +- .../x/tools/go/analysis/passes/lostcancel/lostcancel.go | 4 ++-- src/net/http/h2_bundle.go | 6 +++--- src/vendor/golang.org/x/net/nettest/conntest.go | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go b/src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go index fd076f6328..7d217c71bf 100644 --- a/src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go +++ b/src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go @@ -3995,7 +3995,7 @@ function create(node, id, self) { } // Cancel any pre-empted transitions. No interrupt event is dispatched - // because the canceled transitions never started. Note that this also + // because the cancelled transitions never started. Note that this also // removes this transition from the pending list! else if (+i < id) { o.state = ENDED; diff --git a/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel/lostcancel.go b/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel/lostcancel.go index 20147ac585..de6f840f68 100644 --- a/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel/lostcancel.go +++ b/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel/lostcancel.go @@ -22,8 +22,8 @@ const Doc = `check cancel func returned by context.WithCancel is called The cancellation function returned by context.WithCancel, WithTimeout, and WithDeadline must be called or the new context will remain live -until its parent context is canceled. -(The background context is never canceled.)` +until its parent context is cancelled. +(The background context is never cancelled.)` var Analyzer = &analysis.Analyzer{ Name: "lostcancel", diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index a68a2f5af5..ad311946d5 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -7359,7 +7359,7 @@ func (cc *http2ClientConn) Shutdown(ctx context.Context) error { } // Wait for all in-flight streams to complete or connection to close done := make(chan error, 1) - canceled := false // guarded by cc.mu + cancelled := false // guarded by cc.mu go func() { cc.mu.Lock() defer cc.mu.Unlock() @@ -7369,7 +7369,7 @@ func (cc *http2ClientConn) Shutdown(ctx context.Context) error { done <- cc.tconn.Close() break } - if canceled { + if cancelled { break } cc.cond.Wait() @@ -7382,7 +7382,7 @@ func (cc *http2ClientConn) Shutdown(ctx context.Context) error { case <-ctx.Done(): cc.mu.Lock() // Free the goroutine above - canceled = true + cancelled = true cc.cond.Broadcast() cc.mu.Unlock() return ctx.Err() diff --git a/src/vendor/golang.org/x/net/nettest/conntest.go b/src/vendor/golang.org/x/net/nettest/conntest.go index 4d418a8676..39cc6a631e 100644 --- a/src/vendor/golang.org/x/net/nettest/conntest.go +++ b/src/vendor/golang.org/x/net/nettest/conntest.go @@ -143,7 +143,7 @@ func testPingPong(t *testing.T, c1, c2 net.Conn) { } // testRacyRead tests that it is safe to mutate the input Read buffer -// immediately after cancellation has occurred. +// immediately after cancelation has occurred. func testRacyRead(t *testing.T, c1, c2 net.Conn) { go chunkedCopy(c2, rand.New(rand.NewSource(0))) @@ -171,7 +171,7 @@ func testRacyRead(t *testing.T, c1, c2 net.Conn) { } // testRacyWrite tests that it is safe to mutate the input Write buffer -// immediately after cancellation has occurred. +// immediately after cancelation has occurred. func testRacyWrite(t *testing.T, c1, c2 net.Conn) { go chunkedCopy(ioutil.Discard, c2) @@ -319,7 +319,7 @@ func testCloseTimeout(t *testing.T, c1, c2 net.Conn) { defer wg.Wait() wg.Add(3) - // Test for cancellation upon connection closure. + // Test for cancelation upon connection closure. c1.SetDeadline(neverTimeout) go func() { defer wg.Done()