mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Fix usage of reflect.SliceHeader: reported by vet on tip golang
Example: https://travis-ci.com/github/etcd-io/etcd/jobs/470404938 ``` % (cd server && go vet ./...) stderr: # go.etcd.io/etcd/server/v3/etcdserver/api/v2store stderr: etcdserver/api/v2store/node_extern_test.go:107:9: possible misuse of reflect.SliceHeader stderr: etcdserver/api/v2store/node_extern_test.go:107:16: possible misuse of reflect.SliceHeader ```
This commit is contained in:
parent
70b5ef1d3a
commit
0d9cfc11c8
@ -18,7 +18,6 @@ import (
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
"unsafe"
|
||||
|
||||
"go.etcd.io/etcd/pkg/v3/testutil"
|
||||
)
|
||||
@ -102,13 +101,7 @@ func TestNodeExternClone(t *testing.T) {
|
||||
}
|
||||
|
||||
func sameSlice(a, b []*NodeExtern) bool {
|
||||
<<<<<<< HEAD
|
||||
ah := (*reflect.SliceHeader)(unsafe.Pointer(&a))
|
||||
bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
|
||||
return *ah == *bh
|
||||
=======
|
||||
va := reflect.ValueOf(a)
|
||||
vb := reflect.ValueOf(b)
|
||||
return va.Len() == vb.Len() && va.Pointer() == vb.Pointer()
|
||||
>>>>>>> 6f8273a2a (fixup! e2e: Adding better diagnostic and location for temporary files to Snapshot tests.)
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user