mirror of
https://github.com/golang/go.git
synced 2026-04-02 17:30:01 +09:00
revert changes from generated files
This commit is contained in:
2
src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go
generated
vendored
2
src/cmd/vendor/github.com/google/pprof/third_party/d3/d3.go
generated
vendored
@@ -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;
|
||||
|
||||
4
src/cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel/lostcancel.go
generated
vendored
4
src/cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel/lostcancel.go
generated
vendored
@@ -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",
|
||||
|
||||
@@ -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()
|
||||
|
||||
6
src/vendor/golang.org/x/net/nettest/conntest.go
generated
vendored
6
src/vendor/golang.org/x/net/nettest/conntest.go
generated
vendored
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user