Merge pull request #2591 from rifeplight/master

ucwong · web-flow · commit 1b15a4aa8094 · 2025-12-15T11:33:57.000Z
refactor: drop legacy // +build comment
diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (darwin && !ios && cgo) || freebsd || (linux && !arm64) || netbsd || solaris
-// +build darwin,!ios,cgo freebsd linux,!arm64 netbsd solaris
 
 package keystore
 
diff --git a/accounts/keystore/watch_fallback.go b/accounts/keystore/watch_fallback.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (darwin && !cgo) || ios || (linux && arm64) || windows || (!darwin && !freebsd && !linux && !netbsd && !solaris)
-// +build darwin,!cgo ios linux,arm64 windows !darwin,!freebsd,!linux,!netbsd,!solaris
 
 // This is the fallback implementation of directory watching.
 // It is used on unsupported platforms.
diff --git a/common/bitutil/compress_fuzz.go b/common/bitutil/compress_fuzz.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package bitutil
 
diff --git a/common/fdlimit/fdlimit_bsd.go b/common/fdlimit/fdlimit_bsd.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build freebsd || dragonfly
-// +build freebsd dragonfly
 
 package fdlimit
 
diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build linux || netbsd || openbsd || solaris
-// +build linux netbsd openbsd solaris
 
 package fdlimit
 
diff --git a/core/mkalloc.go b/core/mkalloc.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build none
-// +build none
 
 /*
 The mkalloc tool creates the genesis allocation constants in genesis_alloc.go
diff --git a/core/vm/runtime/fuzz.go b/core/vm/runtime/fuzz.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package runtime
 
diff --git a/crypto/blake2b/blake2bAVX2_amd64.go b/crypto/blake2b/blake2bAVX2_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_amd64.go b/crypto/blake2b/blake2b_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.7 && amd64 && !gccgo && !appengine
-// +build !go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_f_fuzz.go b/crypto/blake2b/blake2b_f_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_f_fuzz_test.go b/crypto/blake2b/blake2b_f_fuzz_test.go
@@ -1,6 +1,5 @@
 // Only enable fuzzer on platforms with AVX enabled
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_ref.go b/crypto/blake2b/blake2b_ref.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || appengine || gccgo
-// +build !amd64 appengine gccgo
 
 package blake2b
 
diff --git a/crypto/blake2b/register.go b/crypto/blake2b/register.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package blake2b
 
diff --git a/crypto/bls12381/arithmetic_decl.go b/crypto/bls12381/arithmetic_decl.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (amd64 && blsasm) || (amd64 && blsadx)
-// +build amd64,blsasm amd64,blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_fallback.go b/crypto/bls12381/arithmetic_fallback.go
diff --git a/crypto/bls12381/arithmetic_x86_adx.go b/crypto/bls12381/arithmetic_x86_adx.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build amd64 && blsadx
-// +build amd64,blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_x86_noadx.go b/crypto/bls12381/arithmetic_x86_noadx.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build amd64 && blsasm
-// +build amd64,blsasm
 
 package bls12381
 
diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build amd64 || arm64
-// +build amd64 arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build gofuzz
-// +build gofuzz
 
 package bn256
 
diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build !amd64 && !arm64
-// +build !amd64,!arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
diff --git a/crypto/bn256/cloudflare/gfp_decl.go b/crypto/bn256/cloudflare/gfp_decl.go
@@ -1,5 +1,4 @@
 //go:build (amd64 && !generic) || (arm64 && !generic)
-// +build amd64,!generic arm64,!generic
 
 package bn256
 
diff --git a/crypto/bn256/cloudflare/gfp_generic.go b/crypto/bn256/cloudflare/gfp_generic.go
@@ -1,5 +1,4 @@
 //go:build (!amd64 && !arm64) || generic
-// +build !amd64,!arm64 generic
 
 package bn256
 
diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go
@@ -1,5 +1,4 @@
 //go:build dummy
-// +build dummy
 
 // This file is part of a workaround for `go mod vendor` which won't vendor
 // C files if there's no Go file in the same directory.
diff --git a/crypto/secp256k1/scalar_mult_nocgo.go b/crypto/secp256k1/scalar_mult_nocgo.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build gofuzz || !cgo
-// +build gofuzz !cgo
 
 package secp256k1
 
diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build !gofuzz && cgo
-// +build !gofuzz,cgo
 
 package secp256k1
 
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !nacl && !js && !wasip1 && cgo && !gofuzz && !tinygo
-// +build !nacl,!js,!wasip1,cgo,!gofuzz,!tinygo
 
 package crypto
 
diff --git a/crypto/signature_nocgo.go b/crypto/signature_nocgo.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build nacl || js || wasip1 || !cgo || gofuzz || tinygo
-// +build nacl js wasip1 !cgo gofuzz tinygo
 
 package crypto
 
diff --git a/crypto/signify/signify_fuzz.go b/crypto/signify/signify_fuzz.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package signify
 
diff --git a/ctxcdb/leveldb/leveldb.go b/ctxcdb/leveldb/leveldb.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !js && !wasip1
-// +build !js,!wasip1
 
 // Package leveldb implements the key-value database layer based on LevelDB.
 package leveldb
diff --git a/event/feedof.go b/event/feedof.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.18
-// +build go1.18
 
 package event
 
diff --git a/event/feedof_test.go b/event/feedof_test.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.18
-// +build go1.18
 
 package event
 
diff --git a/metrics/cpu_disabled.go b/metrics/cpu_disabled.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build ios || js || wasip1 || tinygo
-// +build ios js wasip1 tinygo
 
 package metrics
 
diff --git a/metrics/cpu_enabled.go b/metrics/cpu_enabled.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !ios && !js && !wasip1 && !tinygo
-// +build !ios,!js,!wasip1,!tinygo
 
 package metrics
 
diff --git a/metrics/cputime_nop.go b/metrics/cputime_nop.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows || js || tinygo
-// +build windows js tinygo
 
 package metrics
 
diff --git a/metrics/cputime_unix.go b/metrics/cputime_unix.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows && !js && !wasip1 && !tinygo
-// +build !windows,!js,!wasip1,!tinygo
 
 package metrics
 
diff --git a/metrics/disk_nop.go b/metrics/disk_nop.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !linux
-// +build !linux
 
 package metrics
 
diff --git a/metrics/syslog.go b/metrics/syslog.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package metrics
 
diff --git a/p2p/netutil/toobig_notwindows.go b/p2p/netutil/toobig_notwindows.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows
-// +build !windows
 
 package netutil
 
diff --git a/p2p/netutil/toobig_windows.go b/p2p/netutil/toobig_windows.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows
-// +build windows
 
 package netutil
 
diff --git a/rlp/safe.go b/rlp/safe.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build nacl || js || !cgo
-// +build nacl js !cgo
 
 package rlp
 
diff --git a/rlp/unsafe.go b/rlp/unsafe.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !nacl && !js && cgo
-// +build !nacl,!js,cgo
 
 package rlp
 
diff --git a/rpc/ipc_js.go b/rpc/ipc_js.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build js
-// +build js
 
 package rpc
 
diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
 
 package rpc
 
diff --git a/rpc/ipc_wasip1.go b/rpc/ipc_wasip1.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build wasip1
-// +build wasip1
 
 package rpc
 
diff --git a/rpc/ipc_windows.go b/rpc/ipc_windows.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows
-// +build windows
 
 package rpc
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build gofuzz`
`2`		`-// +build gofuzz`
`3`	`2`
`4`	`3`	`package blake2b`
`5`	`4`