Skip to content

Commit

Permalink
all: make spelling consistent
Browse files Browse the repository at this point in the history
Fixes #17938

Change-Id: Iad12155f4976846bd4a9a53869f89e40e5b3deb3
Reviewed-on: https://go-review.googlesource.com/34147
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
  • Loading branch information
bradfitz committed Dec 8, 2016
1 parent 51a75a0 commit 4c4201f
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions doc/devel/weekly.html
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ <h2 id="2012-02-22">2012-02-22</h2>
fix FreeBSD signal handling around thread creation (thanks Devon H. O'Dell),
goroutine profile, stack dumps,
implement runtime.osyield on FreeBSD 386, amd64 (thanks Devon H. O'Dell),
permit default behaviour of SIGTSTP, SIGTTIN, SIGTTOU,
permit default behavior of SIGTSTP, SIGTTIN, SIGTTOU,
release unused memory to the OS (thanks Sébastien Paolacci),
remove an obsolete file (thanks Mikio Hara).
* spec: make all comparison results untyped bool,
Expand Down Expand Up @@ -4157,7 +4157,7 @@ <h2 id="2011-02-01">2011-02-01</h2>
* suffixarray: use binary search for both ends of Lookup (thanks Eric Eisner).
* syscall: add missing network interface constants (thanks Mikio Hara).
* template: treat map keys as zero, not non-existent (thanks Roger Peppe).
* time: allow cancelling of After events (thanks Roger Peppe),
* time: allow canceling of After events (thanks Roger Peppe),
support Solaris zoneinfo directory.
* token/position: added SetLinesForContent.
* unicode: update to unicode 6.0.0.
Expand Down Expand Up @@ -5696,7 +5696,7 @@ <h2 id="2010-04-13">2010-04-13</h2>
* cmath: new complex math library (thanks Charles L. Dorian).
* docs: update to match current coding style (thanks Christopher Wedgwood).
* exp/eval: fix example and add target to Makefile (thanks Evan Shaw).
* fmt: change behaviour of format verb %b to match %x when negative (thanks Andrei Vieru).
* fmt: change behavior of format verb %b to match %x when negative (thanks Andrei Vieru).
* gc: compile s == "" as len(s) == 0,
distinguish fatal compiler bug from error+exit,
fix alignment on non-amd64,
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/compile/internal/gc/testdata/array.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func testSliceSetElement() {
func testSlicePanic1() {
defer func() {
if r := recover(); r != nil {
println("paniced as expected")
println("panicked as expected")
}
}()

Expand All @@ -119,7 +119,7 @@ func testSlicePanic1() {
func testSlicePanic2() {
defer func() {
if r := recover(); r != nil {
println("paniced as expected")
println("panicked as expected")
}
}()

Expand Down
6 changes: 3 additions & 3 deletions src/cmd/compile/internal/gc/testdata/string.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func testStructSlice() {
func testStringSlicePanic() {
defer func() {
if r := recover(); r != nil {
println("paniced as expected")
println("panicked as expected")
}
}()

Expand Down Expand Up @@ -148,7 +148,7 @@ func testInt64Index() {
func testInt64IndexPanic() {
defer func() {
if r := recover(); r != nil {
println("paniced as expected")
println("panicked as expected")
}
}()

Expand All @@ -161,7 +161,7 @@ func testInt64IndexPanic() {
func testInt64SlicePanic() {
defer func() {
if r := recover(); r != nil {
println("paniced as expected")
println("panicked as expected")
}
}()

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/link/internal/ld/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ func (p *GCProg) AddSym(s *Symbol) {
}

// dataSortKey is used to sort a slice of data symbol *Symbol pointers.
// The sort keys are kept inline to improve cache behaviour while sorting.
// The sort keys are kept inline to improve cache behavior while sorting.
type dataSortKey struct {
size int64
name string
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/link/internal/ld/elf.go
Original file line number Diff line number Diff line change
Expand Up @@ -2777,7 +2777,7 @@ func Elfadddynsym(ctxt *Link, s *Symbol) {
/* type */
t := STB_GLOBAL << 4

// TODO(mwhudson): presumably the behaviour should actually be the same on both arm and 386.
// TODO(mwhudson): presumably the behavior should actually be the same on both arm and 386.
if SysArch.Family == sys.I386 && s.Attr.CgoExport() && s.Type&obj.SMASK == obj.STEXT {
t |= STT_FUNC
} else if SysArch.Family == sys.ARM && s.Attr.CgoExportDynamic() && s.Type&obj.SMASK == obj.STEXT {
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/pprof/internal/svg/svgpan.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const svgPanJS = `
* - Mouse zooming (using the wheel)
* - Object dragging
*
* You can configure the behaviour of the pan/zoom/drag with the variables
* You can configure the behavior of the pan/zoom/drag with the variables
* listed in the CONFIGURATION section of this file.
*
* Known issues:
Expand Down
4 changes: 2 additions & 2 deletions src/context/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -595,14 +595,14 @@ func XTestCancelRemoves(t testingT) {
_, cancel := WithCancel(ctx)
checkChildren("with WithCancel child ", ctx, 1)
cancel()
checkChildren("after cancelling WithCancel child", ctx, 0)
checkChildren("after canceling WithCancel child", ctx, 0)

ctx, _ = WithCancel(Background())
checkChildren("after creation", ctx, 0)
_, cancel = WithTimeout(ctx, 60*time.Minute)
checkChildren("with WithTimeout child ", ctx, 1)
cancel()
checkChildren("after cancelling WithTimeout child", ctx, 0)
checkChildren("after canceling WithTimeout child", ctx, 0)
}

func XTestWithCancelCanceledParent(t testingT) {
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/aes/gcm_s390x.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (g *gcmAsm) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
if subtle.ConstantTimeCompare(expectedTag[:], tag) != 1 {
// The AESNI code decrypts and authenticates concurrently, and
// so overwrites dst in the event of a tag mismatch. That
// behaviour is mimicked here in order to be consistent across
// behavior is mimicked here in order to be consistent across
// platforms.
for i := range out {
out[i] = 0
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/cipher/gcm.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (g *gcm) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
if subtle.ConstantTimeCompare(expectedTag[:], tag) != 1 {
// The AESNI code decrypts and authenticates concurrently, and
// so overwrites dst in the event of a tag mismatch. That
// behaviour is mimicked here in order to be consistent across
// behavior is mimicked here in order to be consistent across
// platforms.
for i := range out {
out[i] = 0
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/x509/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ type VerifyOptions struct {
CurrentTime time.Time // if zero, the current time is used
// KeyUsage specifies which Extended Key Usage values are acceptable.
// An empty list means ExtKeyUsageServerAuth. Key usage is considered a
// constraint down the chain which mirrors Windows CryptoAPI behaviour,
// constraint down the chain which mirrors Windows CryptoAPI behavior,
// but not the spec. To accept any key usage, include ExtKeyUsageAny.
KeyUsages []ExtKeyUsage
}
Expand Down Expand Up @@ -262,7 +262,7 @@ func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *V
// WARNING: this doesn't do any revocation checking.
func (c *Certificate) Verify(opts VerifyOptions) (chains [][]*Certificate, err error) {
// Platform-specific verification needs the ASN.1 contents so
// this makes the behaviour consistent across platforms.
// this makes the behavior consistent across platforms.
if len(c.Raw) == 0 {
return nil, errNotParsed
}
Expand Down
2 changes: 1 addition & 1 deletion src/encoding/asn1/marshal.go
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ func makeField(v reflect.Value, params fieldParameters) (e encoder, err error) {

// If no default value is given then the zero value for the type is
// assumed to be the default value. This isn't obviously the correct
// behaviour, but it's what Go has traditionally done.
// behavior, but it's what Go has traditionally done.
if params.optional && params.defaultValue == nil {
if reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface()) {
return bytesEncoder(nil), nil
Expand Down
2 changes: 1 addition & 1 deletion src/os/exec/exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ func TestContextCancel(t *testing.T) {
break
}
if time.Since(start) > time.Second {
t.Fatal("cancelling context did not stop program")
t.Fatal("canceling context did not stop program")
}
time.Sleep(time.Millisecond)
}
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/iface.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func panicnildottype(want *_type) {

// The conv and assert functions below do very similar things.
// The convXXX functions are guaranteed by the compiler to succeed.
// The assertXXX functions may fail (either panicing or returning false,
// The assertXXX functions may fail (either panicking or returning false,
// depending on whether they are 1-result or 2-result).
// The convXXX functions succeed on a nil input, whereas the assertXXX
// functions fail on a nil input.
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/panic.go
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ func startpanic_m() {
freezetheworld()
return
case 1:
// Something failed while panicing, probably the print of the
// Something failed while panicking, probably the print of the
// argument to panic(). Just print a stack trace and exit.
_g_.m.dying = 2
print("panic during panic\n")
Expand Down
2 changes: 1 addition & 1 deletion test/fixedbugs/issue16130.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// license that can be found in the LICENSE file.

// Test that an interface conversion error panics with an "interface
// conversion" run-time error. It was (incorrectly) panicing with a
// conversion" run-time error. It was (incorrectly) panicking with a
// "nil pointer dereference."

package main
Expand Down

0 comments on commit 4c4201f

Please sign in to comment.