Skip to content

Commit 7ea6212

Browse files
committed
all: be consistent about spelling of cancelation
We had ~30 one way, and these four new occurrences the other way. Updates #11626 Change-Id: Ic6403dc4905874916ae292ff739d33482ed8e5bf Reviewed-on: https://go-review.googlesource.com/24683 Reviewed-by: Rob Pike <[email protected]>
1 parent fc12bb2 commit 7ea6212

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

doc/go1.7.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ <h3 id="cmd_vet">Go vet</h3>
291291
<p id="vet_lostcancel">
292292
The <code>vet</code> command also has a new check,
293293
<code>-lostcancel</code>, which detects failure to call the
294-
cancellation function returned by the <code>WithCancel</code>,
294+
cancelation function returned by the <code>WithCancel</code>,
295295
<code>WithTimeout</code>, and <code>WithDeadline</code> functions in
296296
Go 1.7's new <code>context</code> package (see <a
297297
href='#context'>below</a>).

src/cmd/compile/internal/gc/ssa.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ func (s *state) expr(n *Node) *ssa.Value {
17311731
addop := ssa.OpAdd64F
17321732
subop := ssa.OpSub64F
17331733
pt := floatForComplex(n.Type) // Could be Float32 or Float64
1734-
wt := Types[TFLOAT64] // Compute in Float64 to minimize cancellation error
1734+
wt := Types[TFLOAT64] // Compute in Float64 to minimize cancelation error
17351735

17361736
areal := s.newValue1(ssa.OpComplexReal, pt, a)
17371737
breal := s.newValue1(ssa.OpComplexReal, pt, b)
@@ -1769,7 +1769,7 @@ func (s *state) expr(n *Node) *ssa.Value {
17691769
subop := ssa.OpSub64F
17701770
divop := ssa.OpDiv64F
17711771
pt := floatForComplex(n.Type) // Could be Float32 or Float64
1772-
wt := Types[TFLOAT64] // Compute in Float64 to minimize cancellation error
1772+
wt := Types[TFLOAT64] // Compute in Float64 to minimize cancelation error
17731773

17741774
areal := s.newValue1(ssa.OpComplexReal, pt, a)
17751775
breal := s.newValue1(ssa.OpComplexReal, pt, b)

src/cmd/vet/doc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ Flag: -tests
9191
Mistakes involving tests including functions with incorrect names or signatures
9292
and example tests that document identifiers not in the package.
9393
94-
Failure to call the cancellation function returned by context.WithCancel.
94+
Failure to call the cancelation function returned by context.WithCancel.
9595
9696
Flag: -lostcancel
9797
98-
The cancellation function returned by context.WithCancel, WithTimeout,
98+
The cancelation function returned by context.WithCancel, WithTimeout,
9999
and WithDeadline must be called or the new context will remain live
100100
until its parent context is cancelled.
101101
(The background context is never cancelled.)

src/cmd/vet/lostcancel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
func init() {
1616
register("lostcancel",
17-
"check for failure to call cancellation function returned by context.WithCancel",
17+
"check for failure to call cancelation function returned by context.WithCancel",
1818
checkLostCancel,
1919
funcDecl, funcLit)
2020
}

0 commit comments

Comments
 (0)