From: Jes Cok <xigua67damn@gmail.com>
Date: Tue, 1 Aug 2023 20:22:13 +0000 (+0000)
Subject: encoding/json: replace "between or" with "between and" in comment
X-Git-Tag: go1.22rc1~1451
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f32e0c30e4a002cda2dbb5e628a7f1047e304e01;p=gostls13.git

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>
---

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])
 					}