Merge branch 'master' into utree

gin-gonic · Jan 3, 2021 · 0eb2d6b · 0eb2d6b
2 parents 460d346 + 3b5e861
commit 0eb2d6b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/internal/bytesconv/bytesconv.go b/internal/bytesconv/bytesconv.go
@@ -5,16 +5,17 @@
 package bytesconv
 
 import (
-	"reflect"
 	"unsafe"
 )
 
 // StringToBytes converts string to byte slice without a memory allocation.
 func StringToBytes(s string) (b []byte) {
-	sh := *(*reflect.StringHeader)(unsafe.Pointer(&s))
-	bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
-	bh.Data, bh.Len, bh.Cap = sh.Data, sh.Len, sh.Len
-	return b
+	return *(*[]byte)(unsafe.Pointer(
+		&struct {
+			string
+			Cap int
+		}{s, len(s)},
+	))
 }
 
 // BytesToString converts byte slice to string without a memory allocation.