Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoding/json: spell "marshaling" and "unmarshaling" consistently

Browse source 
Fixes #12431

Change-Id: I67c42bf2cd9285f471387248fd9c22a16b158349
Reviewed-on: https://go-review.googlesource.com/14150
Reviewed-by: Dmitri Shuralyov <shurcool@gmail.com>
Reviewed-by: Rob Pike <r@golang.org>
This commit is contained in:
Andrew Gerrand 2015-09-01 17:51:39 +10:00
parent 7b7f85534c
commit 143f3fd0ee
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/encoding/json/decode.go
View file

@ -57,7 +57,7 @@ import (
// //
// If a JSON value is not appropriate for a given target type, // If a JSON value is not appropriate for a given target type,
// or if a JSON number overflows the target type, Unmarshal // or if a JSON number overflows the target type, Unmarshal
// skips that field and completes the unmarshalling as best it can. // skips that field and completes the unmarshaling as best it can.
// If no more serious errors are encountered, Unmarshal returns // If no more serious errors are encountered, Unmarshal returns
// an UnmarshalTypeError describing the earliest such error. // an UnmarshalTypeError describing the earliest such error.
// //

4
src/encoding/json/decode_test.go
View file

@ -1206,12 +1206,12 @@ func TestStringKind(t *testing.T) {
data, err := Marshal(m1) data, err := Marshal(m1)
if err != nil { if err != nil {
t.Errorf("Unexpected error marshalling: %v", err) t.Errorf("Unexpected error marshaling: %v", err)
} }
err = Unmarshal(data, &m2) err = Unmarshal(data, &m2)
if err != nil { if err != nil {
t.Errorf("Unexpected error unmarshalling: %v", err) t.Errorf("Unexpected error unmarshaling: %v", err)
} }
if !reflect.DeepEqual(m1, m2) { if !reflect.DeepEqual(m1, m2) {