feat: remove unsafe.Slice in om to support go1.18

rueian · rueian · commit f5474247c2ed · 2023-12-17T15:30:24.000+08:00
diff --git a/om/conv.go b/om/conv.go
@@ -3,10 +3,9 @@ package om
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/redis/rueidis"
 	"reflect"
 	"strconv"
-
-	"github.com/redis/rueidis"
 )
 
 func newHashConvFactory(t reflect.Type, schema schema) *hashConvFactory {
@@ -68,7 +67,7 @@ func (r hashConv) FromHash(fields map[string]string) error {
 			continue
 		}
 		if f.conv.StringToValue == nil {
-			if err := json.Unmarshal(unsafe.Slice(unsafe.StringData(v), len(v)), r.entity.Field(f.idx).Addr().Interface()); err != nil {
+			if err := json.Unmarshal([]byte(v), r.entity.Field(f.idx).Addr().Interface()); err != nil {
 				return err
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,9 @@ package om`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
	`6`	`+ "github.com/redis/rueidis"`
`6`	`7`	`"reflect"`
`7`	`8`	`"strconv"`
`8`		`-`
`9`		`- "github.com/redis/rueidis"`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`func newHashConvFactory(t reflect.Type, schema schema) *hashConvFactory {`
`@@ -68,7 +67,7 @@ func (r hashConv) FromHash(fields map[string]string) error {`
`68`	`67`	`continue`
`69`	`68`	`}`
`70`	`69`	`if f.conv.StringToValue == nil {`
`71`		`- if err := json.Unmarshal(unsafe.Slice(unsafe.StringData(v), len(v)), r.entity.Field(f.idx).Addr().Interface()); err != nil {`
	`70`	`+ if err := json.Unmarshal([]byte(v), r.entity.Field(f.idx).Addr().Interface()); err != nil {`
`72`	`71`	`return err`
`73`	`72`	`}`
`74`	`73`	`} else {`