diff options
| author | Dmitri Shuralyov <shurcooL@gmail.com> | 2016-11-09 14:49:12 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-11-12 00:13:35 +0000 |
| commit | d8264de8683dac99ffbbbc1f46415e627b73c9ed (patch) | |
| tree | 460f3e9951e9a2192114c06438d113b01209ba7c /src/encoding/json | |
| parent | 9a78eadeb636689f79dbf6bd3c0a35d830678097 (diff) | |
| download | go-d8264de8683dac99ffbbbc1f46415e627b73c9ed.tar.xz | |
all: spell "marshal" and "unmarshal" consistently
The tree is inconsistent about single l vs double l in those
words in documentation, test messages, and one error value text.
$ git grep -E '[Mm]arshall(|s|er|ers|ed|ing)' | wc -l
42
$ git grep -E '[Mm]arshal(|s|er|ers|ed|ing)' | wc -l
1694
Make it consistently a single l, per earlier decisions. This means
contributors won't be confused by misleading precedence, and it helps
consistency.
Change the spelling in one error value text in newRawAttributes of
crypto/x509 package to be consistent.
This change was generated with:
perl -i -npe 's,([Mm]arshal)l(|s|er|ers|ed|ing),$1$2,' $(git grep -l -E '[Mm]arshall' | grep -v AUTHORS | grep -v CONTRIBUTORS)
Updates #12431.
Follows https://golang.org/cl/14150.
Change-Id: I85d28a2d7692862ccb02d6a09f5d18538b6049a2
Reviewed-on: https://go-review.googlesource.com/33017
Run-TryBot: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/encoding/json')
| -rw-r--r-- | src/encoding/json/decode_test.go | 4 | ||||
| -rw-r--r-- | src/encoding/json/encode_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/encoding/json/decode_test.go b/src/encoding/json/decode_test.go index af84b1b527..bd38ddd319 100644 --- a/src/encoding/json/decode_test.go +++ b/src/encoding/json/decode_test.go @@ -1755,8 +1755,8 @@ func TestStringKind(t *testing.T) { } } -// Custom types with []byte as underlying type could not be marshalled -// and then unmarshalled. +// Custom types with []byte as underlying type could not be marshaled +// and then unmarshaled. // Issue 8962. func TestByteKind(t *testing.T) { type byteKind []byte diff --git a/src/encoding/json/encode_test.go b/src/encoding/json/encode_test.go index ebcf07cf38..6d574cfc47 100644 --- a/src/encoding/json/encode_test.go +++ b/src/encoding/json/encode_test.go @@ -501,7 +501,7 @@ func TestEncodePointerString(t *testing.T) { t.Fatalf("Unmarshal: %v", err) } if back.N == nil { - t.Fatalf("Unmarshalled nil N field") + t.Fatalf("Unmarshaled nil N field") } if *back.N != 42 { t.Fatalf("*N = %d; want 42", *back.N) @@ -632,7 +632,7 @@ func TestTextMarshalerMapKeysAreSorted(t *testing.T) { var re = regexp.MustCompile -// syntactic checks on form of marshalled floating point numbers. +// syntactic checks on form of marshaled floating point numbers. var badFloatREs = []*regexp.Regexp{ re(`p`), // no binary exponential notation re(`^\+`), // no leading + sign |