diff options
Diffstat (limited to 'src/encoding/json')
| -rw-r--r-- | src/encoding/json/decode.go | 10 | ||||
| -rw-r--r-- | src/encoding/json/encode.go | 4 | ||||
| -rw-r--r-- | src/encoding/json/scanner.go | 2 | ||||
| -rw-r--r-- | src/encoding/json/stream.go | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go index 539d952ad6..3e4b16e410 100644 --- a/src/encoding/json/decode.go +++ b/src/encoding/json/decode.go @@ -29,9 +29,9 @@ import ( // with the following additional rules: // // To unmarshal JSON into a pointer, Unmarshal first handles the case of -// the JSON being the JSON literal null. In that case, Unmarshal sets -// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into -// the value pointed at by the pointer. If the pointer is nil, Unmarshal +// the JSON being the JSON literal null. In that case, Unmarshal sets +// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into +// the value pointed at by the pointer. If the pointer is nil, Unmarshal // allocates a new value for it to point to. // // To unmarshal JSON into a struct, Unmarshal matches incoming object @@ -534,7 +534,7 @@ func (d *decodeState) array(v reflect.Value) { if i < v.Len() { if v.Kind() == reflect.Array { - // Array. Zero the rest. + // Array. Zero the rest. z := reflect.Zero(v.Type().Elem()) for ; i < v.Len(); i++ { v.Index(i).Set(z) @@ -902,7 +902,7 @@ func (d *decodeState) literalStore(item []byte, v reflect.Value, fromQuoted bool } // The xxxInterface routines build up a value to be stored -// in an empty interface. They are not strictly necessary, +// in an empty interface. They are not strictly necessary, // but they avoid the weight of reflection in this common case. // valueInterface is like value but returns interface{} diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go index e54f7e9469..982561d6ec 100644 --- a/src/encoding/json/encode.go +++ b/src/encoding/json/encode.go @@ -131,7 +131,7 @@ import ( // an UnsupportedTypeError. // // JSON cannot represent cyclic data structures and Marshal does not -// handle them. Passing cyclic structures to Marshal will result in +// handle them. Passing cyclic structures to Marshal will result in // an infinite recursion. // func Marshal(v interface{}) ([]byte, error) { @@ -325,7 +325,7 @@ func typeEncoder(t reflect.Type) encoderFunc { // To deal with recursive types, populate the map with an // indirect func before we build it. This type waits on the - // real func (f) to be ready and then calls it. This indirect + // real func (f) to be ready and then calls it. This indirect // func is only used for recursive types. encoderCache.Lock() if encoderCache.m == nil { diff --git a/src/encoding/json/scanner.go b/src/encoding/json/scanner.go index e495a4e8f0..a6d8706c73 100644 --- a/src/encoding/json/scanner.go +++ b/src/encoding/json/scanner.go @@ -132,7 +132,7 @@ const ( // These values are stored in the parseState stack. // They give the current state of a composite value -// being scanned. If the parser is inside a nested value +// being scanned. If the parser is inside a nested value // the parseState describes the nested state, outermost at entry 0. const ( parseObjectKey = iota // parsing object key (before colon) diff --git a/src/encoding/json/stream.go b/src/encoding/json/stream.go index c056f2b6a5..f5612692b8 100644 --- a/src/encoding/json/stream.go +++ b/src/encoding/json/stream.go @@ -148,7 +148,7 @@ func (dec *Decoder) refill() error { dec.buf = newBuf } - // Read. Delay error for next iteration (after scan). + // Read. Delay error for next iteration (after scan). n, err := dec.r.Read(dec.buf[len(dec.buf):cap(dec.buf)]) dec.buf = dec.buf[0 : len(dec.buf)+n] |