From 0d9cfc11c8d03fb9bc6e7c7054c26b9e3057c3ba Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Mon, 11 Jan 2021 23:24:01 +0100 Subject: [PATCH] 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 ``` --- server/etcdserver/api/v2store/node_extern_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/server/etcdserver/api/v2store/node_extern_test.go b/server/etcdserver/api/v2store/node_extern_test.go index f5f99951a..48daeb648 100644 --- a/server/etcdserver/api/v2store/node_extern_test.go +++ b/server/etcdserver/api/v2store/node_extern_test.go @@ -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.) }