From 6da6e5a5712446e0ece4d59bfcbe024700f657cc Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Wed, 27 Apr 2022 18:02:52 +0800 Subject: [PATCH] *: fix build tag by run gofix (#34260) ref pingcap/tidb#31716 --- br/pkg/lightning/backend/local/local_freebsd.go | 1 - br/pkg/lightning/backend/local/local_unix.go | 1 - br/pkg/lightning/backend/local/local_unix_generic.go | 1 - br/pkg/lightning/backend/local/local_windows.go | 1 - br/pkg/lightning/common/storage_unix.go | 1 - br/pkg/lightning/common/storage_windows.go | 1 - br/pkg/lightning/manual/manual_nocgo.go | 1 - br/pkg/lightning/sigusr1_other.go | 1 - br/pkg/lightning/sigusr1_unix.go | 1 - br/pkg/lightning/web/res.go | 1 - br/pkg/lightning/web/res_vfsdata.go | 1 - br/pkg/restore/merge_fuzz_test.go | 1 - br/pkg/storage/local_unix.go | 1 - br/pkg/storage/local_windows.go | 1 - br/pkg/utils/dyn_pprof_other.go | 1 - br/pkg/utils/dyn_pprof_unix.go | 1 - cmd/ddltest/column_test.go | 2 +- cmd/ddltest/ddl_test.go | 2 +- cmd/ddltest/index_test.go | 2 +- ddl/restart_test.go | 1 - expression/typeinfer_test.go | 2 +- owner/manager_test.go | 2 +- server/tidb_serial_test.go | 1 - server/tidb_test.go | 1 - store/mockstore/unistore/client/client.go | 2 +- store/mockstore/unistore/cophandler/analyze.go | 2 +- store/mockstore/unistore/pd.go | 2 +- store/mockstore/unistore/rpc.go | 2 +- store/mockstore/unistore/tikv/mock_region.go | 2 +- store/mockstore/unistore/tikv/region.go | 2 +- testkit/asynctestkit.go | 1 - testkit/dbtestkit.go | 1 - testkit/mockstore.go | 1 - testkit/result.go | 1 - testkit/testkit.go | 1 - testkit/testmain/bench.go | 1 - testkit/testmain/wrapper.go | 1 - testkit/testutil/handle.go | 1 - testkit/testutil/require.go | 1 - tidb-binlog/node/registry_test.go | 2 +- util/cpu_posix.go | 1 - util/cpu_windows.go | 1 - util/israce/israce.go | 1 - util/israce/norace.go | 1 - util/localpool/localpool_norace.go | 1 - util/localpool/localpool_race.go | 1 - util/localpool/localpool_test.go | 1 - util/signal/signal_posix.go | 1 - util/signal/signal_windows.go | 1 - util/sys/linux/sys_linux.go | 1 - util/sys/linux/sys_other.go | 1 - util/sys/linux/sys_windows.go | 1 - util/sys/storage/sys_other.go | 1 - util/sys/storage/sys_posix.go | 1 - util/sys/storage/sys_windows.go | 1 - util/testbridge/bridge.go | 1 - util/testkit/fake.go | 1 - util/testkit/testkit.go | 1 - util/testleak/fake.go | 1 - util/testleak/leaktest.go | 1 - 60 files changed, 12 insertions(+), 60 deletions(-) diff --git a/br/pkg/lightning/backend/local/local_freebsd.go b/br/pkg/lightning/backend/local/local_freebsd.go index 3221052f43904..cb4aab3ee0766 100644 --- a/br/pkg/lightning/backend/local/local_freebsd.go +++ b/br/pkg/lightning/backend/local/local_freebsd.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build freebsd -// +build freebsd package local diff --git a/br/pkg/lightning/backend/local/local_unix.go b/br/pkg/lightning/backend/local/local_unix.go index 05dc7a08bb6da..794e5e23ebb92 100644 --- a/br/pkg/lightning/backend/local/local_unix.go +++ b/br/pkg/lightning/backend/local/local_unix.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !windows -// +build !windows package local diff --git a/br/pkg/lightning/backend/local/local_unix_generic.go b/br/pkg/lightning/backend/local/local_unix_generic.go index 4c4dadf0adca2..3c0114c18a846 100644 --- a/br/pkg/lightning/backend/local/local_unix_generic.go +++ b/br/pkg/lightning/backend/local/local_unix_generic.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !freebsd && !windows -// +build !freebsd,!windows package local diff --git a/br/pkg/lightning/backend/local/local_windows.go b/br/pkg/lightning/backend/local/local_windows.go index 9133c4403a13f..ec43b06c18f59 100644 --- a/br/pkg/lightning/backend/local/local_windows.go +++ b/br/pkg/lightning/backend/local/local_windows.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build windows -// +build windows package local diff --git a/br/pkg/lightning/common/storage_unix.go b/br/pkg/lightning/common/storage_unix.go index e779aeb2ea57c..6c4ab4cbeb666 100644 --- a/br/pkg/lightning/common/storage_unix.go +++ b/br/pkg/lightning/common/storage_unix.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !windows -// +build !windows // TODO: Deduplicate this implementation with DM! diff --git a/br/pkg/lightning/common/storage_windows.go b/br/pkg/lightning/common/storage_windows.go index 8617e28d30893..89b9483592f94 100644 --- a/br/pkg/lightning/common/storage_windows.go +++ b/br/pkg/lightning/common/storage_windows.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build windows -// +build windows // TODO: Deduplicate this implementation with DM! diff --git a/br/pkg/lightning/manual/manual_nocgo.go b/br/pkg/lightning/manual/manual_nocgo.go index 74befbd116e6a..bfd30cd3fb6f6 100644 --- a/br/pkg/lightning/manual/manual_nocgo.go +++ b/br/pkg/lightning/manual/manual_nocgo.go @@ -3,7 +3,6 @@ // the LICENSE file. //go:build !cgo -// +build !cgo package manual diff --git a/br/pkg/lightning/sigusr1_other.go b/br/pkg/lightning/sigusr1_other.go index 0e0a050e2c2fd..05ab9529b353c 100644 --- a/br/pkg/lightning/sigusr1_other.go +++ b/br/pkg/lightning/sigusr1_other.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !linux && !darwin && !freebsd && !unix -// +build !linux,!darwin,!freebsd,!unix package lightning diff --git a/br/pkg/lightning/sigusr1_unix.go b/br/pkg/lightning/sigusr1_unix.go index ac01998b5e51d..b1340c8968111 100644 --- a/br/pkg/lightning/sigusr1_unix.go +++ b/br/pkg/lightning/sigusr1_unix.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build linux || darwin || freebsd || unix -// +build linux darwin freebsd unix package lightning diff --git a/br/pkg/lightning/web/res.go b/br/pkg/lightning/web/res.go index c45bd5229a5d5..4bcad1ca16385 100644 --- a/br/pkg/lightning/web/res.go +++ b/br/pkg/lightning/web/res.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build dev -// +build dev package web diff --git a/br/pkg/lightning/web/res_vfsdata.go b/br/pkg/lightning/web/res_vfsdata.go index 25eff81ee291d..4a0019b96e570 100644 --- a/br/pkg/lightning/web/res_vfsdata.go +++ b/br/pkg/lightning/web/res_vfsdata.go @@ -1,7 +1,6 @@ // Code generated by vfsgen; DO NOT EDIT. //go:build !dev -// +build !dev package web diff --git a/br/pkg/restore/merge_fuzz_test.go b/br/pkg/restore/merge_fuzz_test.go index 624f0c3ef4378..e47f53524d1f8 100644 --- a/br/pkg/restore/merge_fuzz_test.go +++ b/br/pkg/restore/merge_fuzz_test.go @@ -1,6 +1,5 @@ // Copyright 2022 PingCAP, Inc. Licensed under Apache-2.0. //go:build go1.18 -// +build go1.18 package restore_test diff --git a/br/pkg/storage/local_unix.go b/br/pkg/storage/local_unix.go index 2dfb89deab476..ab9bcc5ab2bb3 100644 --- a/br/pkg/storage/local_unix.go +++ b/br/pkg/storage/local_unix.go @@ -1,7 +1,6 @@ // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0. //go:build !windows -// +build !windows package storage diff --git a/br/pkg/storage/local_windows.go b/br/pkg/storage/local_windows.go index fc79722f34bf4..98d36b22a8dd6 100644 --- a/br/pkg/storage/local_windows.go +++ b/br/pkg/storage/local_windows.go @@ -1,7 +1,6 @@ // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0. //go:build windows -// +build windows package storage diff --git a/br/pkg/utils/dyn_pprof_other.go b/br/pkg/utils/dyn_pprof_other.go index ed094f4a7d08b..76756181c02d6 100644 --- a/br/pkg/utils/dyn_pprof_other.go +++ b/br/pkg/utils/dyn_pprof_other.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin && !freebsd && !unix -// +build !linux,!darwin,!freebsd,!unix // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0. diff --git a/br/pkg/utils/dyn_pprof_unix.go b/br/pkg/utils/dyn_pprof_unix.go index 36084c5853f20..fe7b1c374c0a7 100644 --- a/br/pkg/utils/dyn_pprof_unix.go +++ b/br/pkg/utils/dyn_pprof_unix.go @@ -1,5 +1,4 @@ //go:build linux || darwin || freebsd || unix -// +build linux darwin freebsd unix // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0. diff --git a/cmd/ddltest/column_test.go b/cmd/ddltest/column_test.go index eb926a7a67eb1..2fbf581764ca9 100644 --- a/cmd/ddltest/column_test.go +++ b/cmd/ddltest/column_test.go @@ -15,6 +15,7 @@ package ddltest import ( + goctx "context" "fmt" "reflect" "sync" @@ -29,7 +30,6 @@ import ( "github.com/pingcap/tidb/types" "github.com/stretchr/testify/require" "go.uber.org/zap" - goctx "golang.org/x/net/context" ) // After add column finished, check the records in the table. diff --git a/cmd/ddltest/ddl_test.go b/cmd/ddltest/ddl_test.go index ad22b4c720e60..ca5d128f0f64e 100644 --- a/cmd/ddltest/ddl_test.go +++ b/cmd/ddltest/ddl_test.go @@ -15,6 +15,7 @@ package ddltest import ( + goctx "context" "database/sql" "database/sql/driver" "flag" @@ -49,7 +50,6 @@ import ( "github.com/pingcap/tidb/types" "github.com/stretchr/testify/require" "go.uber.org/zap" - goctx "golang.org/x/net/context" ) var ( diff --git a/cmd/ddltest/index_test.go b/cmd/ddltest/index_test.go index 705e3a13dec03..7472ddca22a8a 100644 --- a/cmd/ddltest/index_test.go +++ b/cmd/ddltest/index_test.go @@ -15,6 +15,7 @@ package ddltest import ( + goctx "context" "fmt" "math" "sync" @@ -25,7 +26,6 @@ import ( "github.com/pingcap/tidb/store/gcworker" "github.com/pingcap/tidb/table" "github.com/stretchr/testify/require" - goctx "golang.org/x/net/context" ) func getIndex(t table.Table, name string) table.Index { diff --git a/ddl/restart_test.go b/ddl/restart_test.go index cd1e330cd3fa7..44405618e26bd 100644 --- a/ddl/restart_test.go +++ b/ddl/restart_test.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build !race -// +build !race package ddl diff --git a/expression/typeinfer_test.go b/expression/typeinfer_test.go index e15d82185bdc1..dca1eb566f058 100644 --- a/expression/typeinfer_test.go +++ b/expression/typeinfer_test.go @@ -15,6 +15,7 @@ package expression_test import ( + "context" "fmt" "math" "testing" @@ -30,7 +31,6 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/printer" "github.com/stretchr/testify/require" - "golang.org/x/net/context" ) func TestInferType(t *testing.T) { diff --git a/owner/manager_test.go b/owner/manager_test.go index f2c1f5da0584c..d042225387fe2 100644 --- a/owner/manager_test.go +++ b/owner/manager_test.go @@ -16,6 +16,7 @@ package owner_test import ( "context" + goctx "context" "fmt" "runtime" "testing" @@ -32,7 +33,6 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/tests/v3/integration" - goctx "golang.org/x/net/context" ) const testLease = 5 * time.Millisecond diff --git a/server/tidb_serial_test.go b/server/tidb_serial_test.go index 468f840c888ee..18bfeb0c8f235 100644 --- a/server/tidb_serial_test.go +++ b/server/tidb_serial_test.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build !race -// +build !race package server diff --git a/server/tidb_test.go b/server/tidb_test.go index cebec5158628a..c2b4c591b8eb3 100644 --- a/server/tidb_test.go +++ b/server/tidb_test.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build !race -// +build !race package server diff --git a/store/mockstore/unistore/client/client.go b/store/mockstore/unistore/client/client.go index ba03029585785..ea029fcf01932 100644 --- a/store/mockstore/unistore/client/client.go +++ b/store/mockstore/unistore/client/client.go @@ -15,10 +15,10 @@ package client import ( + "context" "time" "github.com/tikv/client-go/v2/tikvrpc" - "golang.org/x/net/context" ) // Client is a client that sends RPC. diff --git a/store/mockstore/unistore/cophandler/analyze.go b/store/mockstore/unistore/cophandler/analyze.go index c8859c2f5f857..3aa8392a52da6 100644 --- a/store/mockstore/unistore/cophandler/analyze.go +++ b/store/mockstore/unistore/cophandler/analyze.go @@ -16,6 +16,7 @@ package cophandler import ( "bytes" + "context" "math" "math/rand" "sort" @@ -40,7 +41,6 @@ import ( "github.com/pingcap/tidb/util/rowcodec" "github.com/pingcap/tipb/go-tipb" "github.com/twmb/murmur3" - "golang.org/x/net/context" ) // handleCopAnalyzeRequest handles coprocessor analyze request. diff --git a/store/mockstore/unistore/pd.go b/store/mockstore/unistore/pd.go index a5129caf01a8d..cd256c2dcfdda 100644 --- a/store/mockstore/unistore/pd.go +++ b/store/mockstore/unistore/pd.go @@ -15,6 +15,7 @@ package unistore import ( + "context" "errors" "math" "sync" @@ -22,7 +23,6 @@ import ( "github.com/pingcap/kvproto/pkg/pdpb" us "github.com/pingcap/tidb/store/mockstore/unistore/tikv" pd "github.com/tikv/pd/client" - "golang.org/x/net/context" ) var _ pd.Client = new(pdClient) diff --git a/store/mockstore/unistore/rpc.go b/store/mockstore/unistore/rpc.go index 3da40691310a5..c1b303c2e3278 100644 --- a/store/mockstore/unistore/rpc.go +++ b/store/mockstore/unistore/rpc.go @@ -15,6 +15,7 @@ package unistore import ( + "context" "io" "math" "os" @@ -35,7 +36,6 @@ import ( us "github.com/pingcap/tidb/store/mockstore/unistore/tikv" "github.com/pingcap/tidb/util/codec" "github.com/tikv/client-go/v2/tikvrpc" - "golang.org/x/net/context" "google.golang.org/grpc/metadata" ) diff --git a/store/mockstore/unistore/tikv/mock_region.go b/store/mockstore/unistore/tikv/mock_region.go index 0ae6b57059cbf..1db8df4506691 100644 --- a/store/mockstore/unistore/tikv/mock_region.go +++ b/store/mockstore/unistore/tikv/mock_region.go @@ -16,6 +16,7 @@ package tikv import ( "bytes" + "context" "sort" "sync" "sync/atomic" @@ -37,7 +38,6 @@ import ( "github.com/pingcap/tidb/tablecodec" "github.com/pingcap/tidb/util/codec" pdclient "github.com/tikv/pd/client" - "golang.org/x/net/context" ) // MPPTaskHandlerMap is a map of *cophandler.MPPTaskHandler. diff --git a/store/mockstore/unistore/tikv/region.go b/store/mockstore/unistore/tikv/region.go index d854c910047a9..623a3b584689d 100644 --- a/store/mockstore/unistore/tikv/region.go +++ b/store/mockstore/unistore/tikv/region.go @@ -16,6 +16,7 @@ package tikv import ( "bytes" + "context" "encoding/binary" "strconv" "sync" @@ -36,7 +37,6 @@ import ( "github.com/pingcap/tidb/store/mockstore/unistore/tikv/mvcc" "github.com/pingcap/tidb/util/codec" "go.uber.org/zap" - "golang.org/x/net/context" ) // InternalKey diff --git a/testkit/asynctestkit.go b/testkit/asynctestkit.go index 34a8d1fdb0dbe..90924828e4a35 100644 --- a/testkit/asynctestkit.go +++ b/testkit/asynctestkit.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testkit diff --git a/testkit/dbtestkit.go b/testkit/dbtestkit.go index 5682597618683..a23bb009d4d1f 100644 --- a/testkit/dbtestkit.go +++ b/testkit/dbtestkit.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testkit diff --git a/testkit/mockstore.go b/testkit/mockstore.go index afa9658b22ae5..9ab3493c3a70c 100644 --- a/testkit/mockstore.go +++ b/testkit/mockstore.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testkit diff --git a/testkit/result.go b/testkit/result.go index b9e288db09e44..30fa7a53d2a2f 100644 --- a/testkit/result.go +++ b/testkit/result.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testkit diff --git a/testkit/testkit.go b/testkit/testkit.go index 123020e3bad06..44a9ae59a5c16 100644 --- a/testkit/testkit.go +++ b/testkit/testkit.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testkit diff --git a/testkit/testmain/bench.go b/testkit/testmain/bench.go index a6670bc37509c..0a245d67e11b7 100644 --- a/testkit/testmain/bench.go +++ b/testkit/testmain/bench.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testmain diff --git a/testkit/testmain/wrapper.go b/testkit/testmain/wrapper.go index 22aeb325cb9c1..2c2eaa58cc1ba 100644 --- a/testkit/testmain/wrapper.go +++ b/testkit/testmain/wrapper.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testmain diff --git a/testkit/testutil/handle.go b/testkit/testutil/handle.go index a506cd347343d..d3b88dc0e6fc4 100644 --- a/testkit/testutil/handle.go +++ b/testkit/testutil/handle.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testutil diff --git a/testkit/testutil/require.go b/testkit/testutil/require.go index 9c217f46c2747..90b157fcb7591 100644 --- a/testkit/testutil/require.go +++ b/testkit/testutil/require.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testutil diff --git a/tidb-binlog/node/registry_test.go b/tidb-binlog/node/registry_test.go index fb6cdc73eb2e5..4991d053afc95 100644 --- a/tidb-binlog/node/registry_test.go +++ b/tidb-binlog/node/registry_test.go @@ -15,6 +15,7 @@ package node import ( + "context" "path" "testing" "time" @@ -22,7 +23,6 @@ import ( "github.com/pingcap/tidb/util/etcd" "github.com/stretchr/testify/require" "go.etcd.io/etcd/tests/v3/integration" - "golang.org/x/net/context" ) var nodePrefix = path.Join(DefaultRootPath, NodePrefix[PumpNode]) diff --git a/util/cpu_posix.go b/util/cpu_posix.go index fda238df8e028..76c74021e21f6 100644 --- a/util/cpu_posix.go +++ b/util/cpu_posix.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build linux || darwin || freebsd || unix -// +build linux darwin freebsd unix package util diff --git a/util/cpu_windows.go b/util/cpu_windows.go index 5a08e8372aaf6..9d2bea0babac1 100644 --- a/util/cpu_windows.go +++ b/util/cpu_windows.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build windows -// +build windows package util diff --git a/util/israce/israce.go b/util/israce/israce.go index 6e511d6ccfa47..e1513d34d9858 100644 --- a/util/israce/israce.go +++ b/util/israce/israce.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build race -// +build race package israce diff --git a/util/israce/norace.go b/util/israce/norace.go index ca735bbdebf02..186089349e9c1 100644 --- a/util/israce/norace.go +++ b/util/israce/norace.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !race -// +build !race package israce diff --git a/util/localpool/localpool_norace.go b/util/localpool/localpool_norace.go index c483d6f35b087..8cb257fe8aaee 100644 --- a/util/localpool/localpool_norace.go +++ b/util/localpool/localpool_norace.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !race -// +build !race package localpool diff --git a/util/localpool/localpool_race.go b/util/localpool/localpool_race.go index 75dfdd6c043fb..47d6d0229afae 100644 --- a/util/localpool/localpool_race.go +++ b/util/localpool/localpool_race.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build race -// +build race package localpool diff --git a/util/localpool/localpool_test.go b/util/localpool/localpool_test.go index 52209fabf78f7..1088457c95090 100644 --- a/util/localpool/localpool_test.go +++ b/util/localpool/localpool_test.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !race -// +build !race package localpool diff --git a/util/signal/signal_posix.go b/util/signal/signal_posix.go index 954bc2cf25db7..823d529b266cf 100644 --- a/util/signal/signal_posix.go +++ b/util/signal/signal_posix.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build linux || darwin || freebsd || unix -// +build linux darwin freebsd unix package signal diff --git a/util/signal/signal_windows.go b/util/signal/signal_windows.go index e4cb053d3b7ed..050479d9d244a 100644 --- a/util/signal/signal_windows.go +++ b/util/signal/signal_windows.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build windows -// +build windows package signal diff --git a/util/sys/linux/sys_linux.go b/util/sys/linux/sys_linux.go index 1095600f32c0e..659d2ee10166c 100644 --- a/util/sys/linux/sys_linux.go +++ b/util/sys/linux/sys_linux.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build linux -// +build linux package linux diff --git a/util/sys/linux/sys_other.go b/util/sys/linux/sys_other.go index 28800f81261ea..2c5729dbefacc 100644 --- a/util/sys/linux/sys_other.go +++ b/util/sys/linux/sys_other.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build !linux && !windows -// +build !linux,!windows package linux diff --git a/util/sys/linux/sys_windows.go b/util/sys/linux/sys_windows.go index bec4bb559eccc..428be298a10eb 100644 --- a/util/sys/linux/sys_windows.go +++ b/util/sys/linux/sys_windows.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build windows -// +build windows package linux diff --git a/util/sys/storage/sys_other.go b/util/sys/storage/sys_other.go index 1a17ba43942cf..6cd200da94294 100644 --- a/util/sys/storage/sys_other.go +++ b/util/sys/storage/sys_other.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !linux && !windows && !darwin -// +build !linux,!windows,!darwin package storage diff --git a/util/sys/storage/sys_posix.go b/util/sys/storage/sys_posix.go index 0d8d02a392299..4e825812ec388 100644 --- a/util/sys/storage/sys_posix.go +++ b/util/sys/storage/sys_posix.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build linux || darwin -// +build linux darwin package storage diff --git a/util/sys/storage/sys_windows.go b/util/sys/storage/sys_windows.go index a932ea98a76b4..702438ab4c718 100644 --- a/util/sys/storage/sys_windows.go +++ b/util/sys/storage/sys_windows.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build windows -// +build windows package storage diff --git a/util/testbridge/bridge.go b/util/testbridge/bridge.go index a682a6574fa3c..c761848fbce66 100644 --- a/util/testbridge/bridge.go +++ b/util/testbridge/bridge.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testbridge diff --git a/util/testkit/fake.go b/util/testkit/fake.go index 60352489e6ba8..2c676427b7c6f 100644 --- a/util/testkit/fake.go +++ b/util/testkit/fake.go @@ -13,6 +13,5 @@ // limitations under the License. //go:build codes -// +build codes package testkit diff --git a/util/testkit/testkit.go b/util/testkit/testkit.go index 2cbe3e69ffb96..6ab557f0da040 100644 --- a/util/testkit/testkit.go +++ b/util/testkit/testkit.go @@ -13,7 +13,6 @@ // limitations under the License. //go:build !codes -// +build !codes package testkit diff --git a/util/testleak/fake.go b/util/testleak/fake.go index ad983d59dadd4..22f74ad482129 100644 --- a/util/testleak/fake.go +++ b/util/testleak/fake.go @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. //go:build !leak -// +build !leak package testleak diff --git a/util/testleak/leaktest.go b/util/testleak/leaktest.go index 13bb442f29293..7c0c4a57fe225 100644 --- a/util/testleak/leaktest.go +++ b/util/testleak/leaktest.go @@ -17,7 +17,6 @@ // license that can be found in the LICENSE file. //go:build leak -// +build leak package testleak