[]byte is wider than string, so newer versions of -race correctly cal…

…l us out for converting to []byte
bet365 · Feb 4, 2021 · 8f3924c · 8f3924c
1 parent cfca0b3
commit 8f3924c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/ptrconvert.go b/ptrconvert.go
@@ -89,7 +89,7 @@ func ptrFloat64ToBuf(v unsafe.Pointer, b *Buffer) {
 }
 
 func ptrStringToBuf(v unsafe.Pointer, b *Buffer) {
-	b.Write(*(*[]byte)(v))
+	b.WriteString(*(*string)(v))
 }
 
 func ptrTimeToBuf(v unsafe.Pointer, b *Buffer) {

diff --git a/structencoder.go b/structencoder.go
@@ -114,8 +114,7 @@ func (e *StructEncoder) optInstrStringer() {
 		if !ok {
 			return
 		}
-		sr := e.String()
-		w.Write(*(*[]byte)(unsafe.Pointer(&sr)))
+		w.WriteString(e.String())
 	}
 
 	if e.f.Type.Kind() == reflect.Ptr {
@@ -151,12 +150,12 @@ func (e *StructEncoder) optInstrEncoder() {
 
 func (e *StructEncoder) optInstrRaw() {
 	conv := func(v unsafe.Pointer, w *Buffer) {
-		s := *(*[]byte)(v)
+		s := *(*string)(v)
 		if len(s) == 0 {
 			w.Write(null)
 			return
 		}
-		w.Write(s)
+		w.WriteString(s)
 	}
 
 	if e.f.Type.Kind() == reflect.Ptr {