aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Cok <xigua67damn@gmail.com>2023-08-01 20:22:13 +0000
committerGopher Robot <gobot@golang.org>2023-08-01 20:51:54 +0000
commitf32e0c30e4a002cda2dbb5e628a7f1047e304e01 (patch)
tree993e011c527e76ecb0b50ef136a4650d4f8cb3e4
parent319504ce439e2e55c8a2f9a031fe290bf8f7e1a1 (diff)
downloadgo-f32e0c30e4a002cda2dbb5e628a7f1047e304e01.tar.xz
encoding/json: replace "between or" with "between and" in comment
Change-Id: Id19a15f9367de10e08a9ec22a8cb50c58d517906 GitHub-Last-Rev: f413d71c9ad0f2efc0b4811c7188cc2caa9c1de0 GitHub-Pull-Request: golang/go#61701 Reviewed-on: https://go-review.googlesource.com/c/go/+/514976 Reviewed-by: Russ Cox <rsc@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> Auto-Submit: Russ Cox <rsc@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com>
-rw-r--r--src/encoding/json/encode.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go
index bba57fdf4f..4669a02e2e 100644
--- a/src/encoding/json/encode.go
+++ b/src/encoding/json/encode.go
@@ -1168,7 +1168,7 @@ func typeFields(t reflect.Type) structFields {
if count[f.typ] > 1 {
// If there were multiple instances, add a second,
// so that the annihilation code will see a duplicate.
- // It only cares about the distinction between 1 or 2,
+ // It only cares about the distinction between 1 and 2,
// so don't bother generating any more copies.
fields = append(fields, fields[len(fields)-1])
}