Skip to content

Commit 1b45c99

Browse files
committed
cue: remove unneeded fields from goField
These were carried over from JSON, where they are used to efficiently encode the fields as JSON keys repeatedly. Here we don't deal with JSON encoding or decoding at all. Signed-off-by: Daniel Martí <[email protected]> Change-Id: Ifa86da924cf261a86ba58f3e888c294f450e49f7 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1201761 Unity-Result: CUE porcuepine <[email protected]> Reviewed-by: Roger Peppe <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
1 parent 774e40e commit 1b45c99

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

cue/decode.go

-14
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,6 @@ type goField struct {
480480
nameBytes []byte // []byte(name)
481481
equalFold func(s, t []byte) bool // bytes.EqualFold or equivalent
482482

483-
nameNonEsc string // `"` + name + `":`
484-
nameEscHTML string // `"` + HTMLEscape(name) + `":`
485-
486483
tag bool
487484
index []int
488485
typ reflect.Type
@@ -518,9 +515,6 @@ func typeFields(t reflect.Type) structFields {
518515
// Fields found.
519516
var fields []goField
520517

521-
// Buffer to run HTMLEscape on field names.
522-
var nameEscBuf bytes.Buffer
523-
524518
for len(next) > 0 {
525519
current, next = next, current[:0]
526520
count, nextCount = nextCount, map[reflect.Type]int{}
@@ -584,14 +578,6 @@ func typeFields(t reflect.Type) structFields {
584578
field.nameBytes = []byte(field.name)
585579
field.equalFold = foldFunc(field.nameBytes)
586580

587-
// Build nameEscHTML and nameNonEsc ahead of time.
588-
nameEscBuf.Reset()
589-
nameEscBuf.WriteString(`"`)
590-
json.HTMLEscape(&nameEscBuf, field.nameBytes)
591-
nameEscBuf.WriteString(`":`)
592-
field.nameEscHTML = nameEscBuf.String()
593-
field.nameNonEsc = `"` + field.name + `":`
594-
595581
fields = append(fields, field)
596582
if count[f.typ] > 1 {
597583
// If there were multiple instances, add a second,

0 commit comments

Comments
 (0)