diff --git a/src/encoding/json/v2/arshal.go b/src/encoding/json/v2/arshal.go index 573d26567f3..e26f3340ee2 100644 --- a/src/encoding/json/v2/arshal.go +++ b/src/encoding/json/v2/arshal.go @@ -11,8 +11,6 @@ import ( "encoding" "io" "reflect" - "slices" - "strings" "sync" "time" @@ -575,7 +573,3 @@ func putStrings(s *stringSlice) { } stringsPools.Put(s) } - -func (ss *stringSlice) Sort() { - slices.SortFunc(*ss, func(x, y string) int { return strings.Compare(x, y) }) -} diff --git a/src/encoding/json/v2/arshal_any.go b/src/encoding/json/v2/arshal_any.go index 97a77e92376..8c0c445404d 100644 --- a/src/encoding/json/v2/arshal_any.go +++ b/src/encoding/json/v2/arshal_any.go @@ -10,6 +10,7 @@ import ( "cmp" "math" "reflect" + "slices" "strconv" "encoding/json/internal" @@ -153,7 +154,7 @@ func marshalObjectAny(enc *jsontext.Encoder, obj map[string]any, mo *jsonopts.St (*names)[i] = name i++ } - names.Sort() + slices.Sort(*names) for _, name := range *names { if err := enc.WriteToken(jsontext.String(name)); err != nil { return err diff --git a/src/encoding/json/v2/arshal_default.go b/src/encoding/json/v2/arshal_default.go index 078d345e143..33931af17e6 100644 --- a/src/encoding/json/v2/arshal_default.go +++ b/src/encoding/json/v2/arshal_default.go @@ -843,7 +843,7 @@ func makeMapArshaler(t reflect.Type) *arshaler { k.SetIterKey(iter) (*names)[i] = k.String() } - names.Sort() + slices.Sort(*names) for _, name := range *names { if err := enc.WriteToken(jsontext.String(name)); err != nil { return err diff --git a/src/encoding/json/v2/arshal_inlined.go b/src/encoding/json/v2/arshal_inlined.go index d911bfa1c04..03e563a0c09 100644 --- a/src/encoding/json/v2/arshal_inlined.go +++ b/src/encoding/json/v2/arshal_inlined.go @@ -11,6 +11,7 @@ import ( "errors" "io" "reflect" + "slices" "encoding/json/internal/jsonflags" "encoding/json/internal/jsonopts" @@ -146,7 +147,7 @@ func marshalInlinedFallbackAll(enc *jsontext.Encoder, va addressableValue, mo *j mk.SetIterKey(iter) (*names)[i] = mk.String() } - names.Sort() + slices.Sort(*names) for _, name := range *names { mk.SetString(name) if err := marshalKey(mk); err != nil {