all: remove old +build tags

The //go:build syntax was introduced in Go 1.17: https://go.dev/doc/go1.17#build-lines gofmt has kept the +build and go:build lines in sync since then, but enough time has passed. Time to remove them. Done with: perl -i -npe 's,^// \+build.*\n,,' $(git grep -l -F '+build') Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
2 years ago · da8def8e13
parent bb2cba0cd1
commit da8def8e13
160 changed files with 0 additions and 166 deletions
--- a/client/tailscale/acl.go
+++ b/client/tailscale/acl.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package tailscale

--- a/client/tailscale/devices.go
+++ b/client/tailscale/devices.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package tailscale

--- a/client/tailscale/dns.go
+++ b/client/tailscale/dns.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package tailscale

--- a/client/tailscale/localclient.go
+++ b/client/tailscale/localclient.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package tailscale

--- a/client/tailscale/required_version.go
+++ b/client/tailscale/required_version.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !go1.19
-// +build !go1.19

 package tailscale

--- a/client/tailscale/routes.go
+++ b/client/tailscale/routes.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package tailscale

--- a/client/tailscale/tailnet.go
+++ b/client/tailscale/tailnet.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package tailscale

--- a/client/tailscale/tailscale.go
+++ b/client/tailscale/tailscale.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 // Package tailscale contains Go clients for the Tailscale Local API and
 // Tailscale control plane API.
--- a/cmd/containerboot/kube.go
+++ b/cmd/containerboot/kube.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package main

--- a/cmd/containerboot/main.go
+++ b/cmd/containerboot/main.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 // The containerboot binary is a wrapper for starting tailscaled in a
 // container. It handles reading the desired mode of operation out of
--- a/cmd/tailscale/cli/diag.go
+++ b/cmd/tailscale/cli/diag.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || windows || darwin
-// +build linux windows darwin

 package cli

--- a/cmd/tailscale/cli/diag_other.go
+++ b/cmd/tailscale/cli/diag_other.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && !windows && !darwin
-// +build !linux,!windows,!darwin

 package cli

--- a/cmd/tailscale/cli/ssh_exec.go
+++ b/cmd/tailscale/cli/ssh_exec.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js && !windows
-// +build !js,!windows

 package cli

--- a/cmd/tailscale/cli/ssh_unix.go
+++ b/cmd/tailscale/cli/ssh_unix.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js && !windows
-// +build !js,!windows

 package cli

--- a/cmd/tailscaled/debug.go
+++ b/cmd/tailscaled/debug.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package main

--- a/cmd/tailscaled/install_darwin.go
+++ b/cmd/tailscaled/install_darwin.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package main

--- a/cmd/tailscaled/install_windows.go
+++ b/cmd/tailscaled/install_windows.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package main

--- a/cmd/tailscaled/proxy.go
+++ b/cmd/tailscaled/proxy.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 // HTTP proxy code

--- a/cmd/tailscaled/required_version.go
+++ b/cmd/tailscaled/required_version.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !go1.19
-// +build !go1.19

 package main

--- a/cmd/tailscaled/ssh.go
+++ b/cmd/tailscaled/ssh.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || darwin
-// +build linux darwin

 package main

--- a/cmd/tailscaled/tailscaled.go
+++ b/cmd/tailscaled/tailscaled.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 // The tailscaled program is the Tailscale client daemon. It's configured
 // and controlled via the tailscale CLI program.
--- a/cmd/tailscaled/tailscaled_bird.go
+++ b/cmd/tailscaled/tailscaled_bird.go
@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19 && (linux || darwin || freebsd || openbsd)
-// +build go1.19
-// +build linux darwin freebsd openbsd

 package main

--- a/cmd/tailscaled/tailscaled_notwindows.go
+++ b/cmd/tailscaled/tailscaled_notwindows.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows && go1.19
-// +build !windows,go1.19

 package main // import "tailscale.com/cmd/tailscaled"

--- a/cmd/tailscaled/tailscaled_windows.go
+++ b/cmd/tailscaled/tailscaled_windows.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.19
-// +build go1.19

 package main // import "tailscale.com/cmd/tailscaled"

--- a/cmd/tailscaled/with_cli.go
+++ b/cmd/tailscaled/with_cli.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ts_include_cli
-// +build ts_include_cli

 package main

--- a/cmd/tsshd/tsshd.go
+++ b/cmd/tsshd/tsshd.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ignore
-// +build ignore

 // The tsshd binary was an experimental SSH server that accepts connections
 // from anybody on the same Tailscale network.
--- a/control/controlclient/sign_supported.go
+++ b/control/controlclient/sign_supported.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build windows && cgo
-// +build windows,cgo

 // darwin,cgo is also supported by certstore but machineCertificateSubject will
 // need to be loaded by a different mechanism, so this is not currently enabled
--- a/control/controlclient/sign_supported_test.go
+++ b/control/controlclient/sign_supported_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build windows && cgo
-// +build windows,cgo

 package controlclient

--- a/control/controlclient/sign_unsupported.go
+++ b/control/controlclient/sign_unsupported.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows || !cgo
-// +build !windows !cgo

 package controlclient

--- a/control/controlhttp/client.go
+++ b/control/controlhttp/client.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js
-// +build !js

 // Package controlhttp implements the Tailscale 2021 control protocol
 // base transport over HTTP.
--- a/derp/derp_server_default.go
+++ b/derp/derp_server_default.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux
-// +build !linux

 package derp

--- a/derp/derphttp/websocket.go
+++ b/derp/derphttp/websocket.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || js
-// +build linux js

 package derphttp

--- a/disco/disco_fuzzer.go
+++ b/disco/disco_fuzzer.go
@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //go:build gofuzz
-// +build gofuzz

 package disco

--- a/hostinfo/hostinfo_darwin.go
+++ b/hostinfo/hostinfo_darwin.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin
-// +build darwin

 package hostinfo

--- a/hostinfo/hostinfo_freebsd.go
+++ b/hostinfo/hostinfo_freebsd.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build freebsd
-// +build freebsd

 package hostinfo

--- a/hostinfo/hostinfo_linux.go
+++ b/hostinfo/hostinfo_linux.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && !android
-// +build linux,!android

 package hostinfo

--- a/hostinfo/hostinfo_linux_test.go
+++ b/hostinfo/hostinfo_linux_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && !android
-// +build linux,!android

 package hostinfo

--- a/internal/tooldeps/tooldeps.go
+++ b/internal/tooldeps/tooldeps.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build for_go_mod_tidy_only
-// +build for_go_mod_tidy_only

 package tooldeps

--- a/ipn/ipnlocal/peerapi_h2c.go
+++ b/ipn/ipnlocal/peerapi_h2c.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !ios && !android && !js
-// +build !ios,!android,!js

 package ipnlocal

--- a/ipn/ipnlocal/peerapi_macios_ext.go
+++ b/ipn/ipnlocal/peerapi_macios_ext.go
@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ts_macext && (darwin || ios)
-// +build ts_macext
-// +build darwin ios

 package ipnlocal

--- a/ipn/ipnlocal/ssh.go
+++ b/ipn/ipnlocal/ssh.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || (darwin && !ios)
-// +build linux darwin,!ios

 package ipnlocal

--- a/ipn/ipnlocal/ssh_test.go
+++ b/ipn/ipnlocal/ssh_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || (darwin && !ios)
-// +build linux darwin,!ios

 package ipnlocal

--- a/ipn/ipnserver/proxyconnect.go
+++ b/ipn/ipnserver/proxyconnect.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js
-// +build !js

 package ipnserver

--- a/ipn/localapi/cert.go
+++ b/ipn/localapi/cert.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !ios && !android && !js
-// +build !ios,!android,!js

 package localapi

--- a/ipn/localapi/cert_test.go
+++ b/ipn/localapi/cert_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !ios && !android && !js
-// +build !ios,!android,!js

 package localapi

--- a/ipn/localapi/disabled_stubs.go
+++ b/ipn/localapi/disabled_stubs.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ios || android || js
-// +build ios android js

 package localapi

--- a/ipn/localapi/profile.go
+++ b/ipn/localapi/profile.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !ios && !android && !js
-// +build !ios,!android,!js

 // We don't include it on mobile where we're more memory constrained and
 // there's no CLI to get at the results anyway.
--- a/ipn/store/awsstore/store_aws.go
+++ b/ipn/store/awsstore/store_aws.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && !ts_omit_aws
-// +build linux,!ts_omit_aws

 // Package awsstore contains an ipn.StateStore implementation using AWS SSM.
 package awsstore
--- a/ipn/store/awsstore/store_aws_stub.go
+++ b/ipn/store/awsstore/store_aws_stub.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux || ts_omit_aws
-// +build !linux ts_omit_aws

 package awsstore

--- a/ipn/store/awsstore/store_aws_test.go
+++ b/ipn/store/awsstore/store_aws_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package awsstore

--- a/log/logheap/logheap.go
+++ b/log/logheap/logheap.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js
-// +build !js

 // Package logheap logs a heap pprof profile.
 package logheap
--- a/logtail/filch/filch_unix.go
+++ b/logtail/filch/filch_unix.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows && !js
-// +build !windows,!js

 package filch

--- a/metrics/fds_notlinux.go
+++ b/metrics/fds_notlinux.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux
-// +build !linux

 package metrics

--- a/net/dns/debian_resolvconf.go
+++ b/net/dns/debian_resolvconf.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || freebsd || openbsd
-// +build linux freebsd openbsd

 package dns

--- a/net/dns/flush_default.go
+++ b/net/dns/flush_default.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows
-// +build !windows

 package dns

--- a/net/dns/ini.go
+++ b/net/dns/ini.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build windows
-// +build windows

 package dns

--- a/net/dns/ini_test.go
+++ b/net/dns/ini_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build windows
-// +build windows

 package dns

--- a/net/dns/manager_default.go
+++ b/net/dns/manager_default.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && !freebsd && !openbsd && !windows && !darwin
-// +build !linux,!freebsd,!openbsd,!windows,!darwin

 package dns

--- a/net/dns/nm.go
+++ b/net/dns/nm.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package dns

--- a/net/dns/openresolv.go
+++ b/net/dns/openresolv.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || freebsd || openbsd
-// +build linux freebsd openbsd

 package dns

--- a/net/dns/resolvconf.go
+++ b/net/dns/resolvconf.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || freebsd || openbsd
-// +build linux freebsd openbsd

 package dns

--- a/net/dns/resolvd.go
+++ b/net/dns/resolvd.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build openbsd
-// +build openbsd

 package dns

--- a/net/dns/resolved.go
+++ b/net/dns/resolved.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package dns

--- a/net/dns/resolver/macios_ext.go
+++ b/net/dns/resolver/macios_ext.go
@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ts_macext && (darwin || ios)
-// +build ts_macext
-// +build darwin ios

 package resolver

--- a/net/dnsfallback/update-dns-fallbacks.go
+++ b/net/dnsfallback/update-dns-fallbacks.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ignore
-// +build ignore

 package main

--- a/net/interfaces/interfaces_bsd.go
+++ b/net/interfaces/interfaces_bsd.go
@ -6,7 +6,6 @@
 // BSD systems (e.g. OpenBSD) but has not been tested.

 //go:build darwin || freebsd
-// +build darwin freebsd

 package interfaces

--- a/net/interfaces/interfaces_default_route_test.go
+++ b/net/interfaces/interfaces_default_route_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux || (darwin && !ts_macext)
-// +build linux darwin,!ts_macext

 package interfaces

--- a/net/interfaces/interfaces_defaultrouteif_todo.go
+++ b/net/interfaces/interfaces_defaultrouteif_todo.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && !windows && !darwin && !freebsd
-// +build !linux,!windows,!darwin,!freebsd

 package interfaces

--- a/net/interfaces/interfaces_freebsd.go
+++ b/net/interfaces/interfaces_freebsd.go
@ -5,7 +5,6 @@
 // This might work on other BSDs, but only tested on FreeBSD.

 //go:build freebsd
-// +build freebsd

 package interfaces

--- a/net/netns/netns_android.go
+++ b/net/netns/netns_android.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build android
-// +build android

 package netns

--- a/net/netns/netns_darwin_tailscaled.go
+++ b/net/netns/netns_darwin_tailscaled.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin && !ts_macext
-// +build darwin,!ts_macext

 package netns

--- a/net/netns/netns_default.go
+++ b/net/netns/netns_default.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build (!linux && !windows && !darwin) || (darwin && ts_macext)
-// +build !linux,!windows,!darwin darwin,ts_macext

 package netns

--- a/net/netns/netns_linux.go
+++ b/net/netns/netns_linux.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && !android
-// +build linux,!android

 package netns

--- a/net/netns/netns_macios.go
+++ b/net/netns/netns_macios.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin || ios
-// +build darwin ios

 package netns

--- a/net/netns/socks.go
+++ b/net/netns/socks.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !ios && !js
-// +build !ios,!js

 package netns

--- a/net/netstat/netstat_noimpl.go
+++ b/net/netstat/netstat_noimpl.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows
-// +build !windows

 package netstat

--- a/net/portmapper/disabled_stubs.go
+++ b/net/portmapper/disabled_stubs.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build js
-// +build js

 package portmapper

--- a/net/portmapper/upnp.go
+++ b/net/portmapper/upnp.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js
-// +build !js

 // (no raw sockets in JS/WASM)

--- a/net/routetable/routetable_bsd.go
+++ b/net/routetable/routetable_bsd.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin || freebsd
-// +build darwin freebsd

 package routetable

--- a/net/routetable/routetable_bsd_test.go
+++ b/net/routetable/routetable_bsd_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin || freebsd
-// +build darwin freebsd

 package routetable

--- a/net/routetable/routetable_darwin.go
+++ b/net/routetable/routetable_darwin.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin
-// +build darwin

 package routetable

--- a/net/routetable/routetable_freebsd.go
+++ b/net/routetable/routetable_freebsd.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build freebsd
-// +build freebsd

 package routetable

--- a/net/routetable/routetable_linux.go
+++ b/net/routetable/routetable_linux.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package routetable

--- a/net/routetable/routetable_linux_test.go
+++ b/net/routetable/routetable_linux_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package routetable

--- a/net/stun/stun_fuzzer.go
+++ b/net/stun/stun_fuzzer.go
@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //go:build gofuzz
-// +build gofuzz

 package stun

--- a/net/tlsdial/deps_test.go
+++ b/net/tlsdial/deps_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build for_go_mod_tidy_only
-// +build for_go_mod_tidy_only

 package tlsdial

--- a/net/tsdial/peerapi_macios_ext.go
+++ b/net/tsdial/peerapi_macios_ext.go
@ -7,8 +7,6 @@
 // and System Extension). It's not used on tailscaled-on-macOS.

 //go:build ts_macext && (darwin || ios)
-// +build ts_macext
-// +build darwin ios

 package tsdial

--- a/net/tshttpproxy/tshttpproxy_future.go
+++ b/net/tshttpproxy/tshttpproxy_future.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build tailscale_go
-// +build tailscale_go

 // We want to use https://github.com/golang/go/issues/41048 but it's only in the
 // Tailscale Go tree for now. Hence the build tag above.
--- a/net/tshttpproxy/tshttpproxy_linux.go
+++ b/net/tshttpproxy/tshttpproxy_linux.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package tshttpproxy

--- a/net/tshttpproxy/tshttpproxy_synology.go
+++ b/net/tshttpproxy/tshttpproxy_synology.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package tshttpproxy

--- a/net/tshttpproxy/tshttpproxy_synology_test.go
+++ b/net/tshttpproxy/tshttpproxy_synology_test.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux
-// +build linux

 package tshttpproxy

--- a/net/tstun/ifstatus_noop.go
+++ b/net/tstun/ifstatus_noop.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows
-// +build !windows

 package tstun

--- a/net/tstun/linkattrs_notlinux.go
+++ b/net/tstun/linkattrs_notlinux.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux
-// +build !linux

 package tstun

--- a/net/tstun/tap_unsupported.go
+++ b/net/tstun/tap_unsupported.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux
-// +build !linux

 package tstun

--- a/net/tstun/tun.go
+++ b/net/tstun/tun.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !js
-// +build !js

 // Package tun creates a tuntap device, working around OS-specific
 // quirks if necessary.
--- a/net/tstun/tun_macos.go
+++ b/net/tstun/tun_macos.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build darwin && !ios
-// +build darwin,!ios

 package tstun

--- a/net/tstun/tun_notwindows.go
+++ b/net/tstun/tun_notwindows.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows
-// +build !windows

 package tstun

--- a/paths/paths_unix.go
+++ b/paths/paths_unix.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !windows && !js
-// +build !windows,!js

 package paths

--- a/portlist/netstat.go
+++ b/portlist/netstat.go
@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !ios && !js
-// +build !ios,!js

 package portlist

--- a/portlist/netstat_exec.go
+++ b/portlist/netstat_exec.go
@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build (windows || freebsd || openbsd || darwin) && !ios && !js
-// +build windows freebsd openbsd darwin
-// +build !ios
-// +build !js

 package portlist

--- a/Show More
+++ b/Show More