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>
This commit is contained in:
Brad Fitzpatrick 2022-11-04 06:42:58 -07:00 committed by Brad Fitzpatrick
parent bb2cba0cd1
commit da8def8e13
160 changed files with 0 additions and 166 deletions

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package tailscale

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package tailscale

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package tailscale

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package tailscale

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !go1.19
// +build !go1.19
package tailscale

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package tailscale

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package tailscale

View File

@ -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.

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package main

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || windows || darwin
// +build linux windows darwin
package cli

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux && !windows && !darwin
// +build !linux,!windows,!darwin
package cli

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !windows
// +build !js,!windows
package cli

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !windows
// +build !js,!windows
package cli

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package main

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package main

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
package main

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.19
// +build go1.19
// HTTP proxy code

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !go1.19
// +build !go1.19
package main

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || darwin
// +build linux darwin
package main

View File

@ -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.

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ts_include_cli
// +build ts_include_cli
package main

View File

@ -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.

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows && cgo
// +build windows,cgo
package controlclient

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows || !cgo
// +build !windows !cgo
package controlclient

View File

@ -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.

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
// +build !linux
package derp

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || js
// +build linux js
package derphttp

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin
// +build darwin
package hostinfo

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd
// +build freebsd
package hostinfo

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !android
// +build linux,!android
package hostinfo

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !android
// +build linux,!android
package hostinfo

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios && !android && !js
// +build !ios,!android,!js
package ipnlocal

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || (darwin && !ios)
// +build linux darwin,!ios
package ipnlocal

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || (darwin && !ios)
// +build linux darwin,!ios
package ipnlocal

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
// +build !js
package ipnserver

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios && !android && !js
// +build !ios,!android,!js
package localapi

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios && !android && !js
// +build !ios,!android,!js
package localapi

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ios || android || js
// +build ios android js
package localapi

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package awsstore

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !js
// +build !windows,!js
package filch

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
// +build !linux
package metrics

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || freebsd || openbsd
// +build linux freebsd openbsd
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
// +build !windows
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
// +build windows
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
// +build windows
package dns

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || freebsd || openbsd
// +build linux freebsd openbsd
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || freebsd || openbsd
// +build linux freebsd openbsd
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd
// +build openbsd
package dns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package dns

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
// +build ignore
package main

View File

@ -6,7 +6,6 @@
// BSD systems (e.g. OpenBSD) but has not been tested.
//go:build darwin || freebsd
// +build darwin freebsd
package interfaces

View File

@ -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

View File

@ -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

View File

@ -5,7 +5,6 @@
// This might work on other BSDs, but only tested on FreeBSD.
//go:build freebsd
// +build freebsd
package interfaces

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build android
// +build android
package netns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin && !ts_macext
// +build darwin,!ts_macext
package netns

View File

@ -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

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !android
// +build linux,!android
package netns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || ios
// +build darwin ios
package netns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios && !js
// +build !ios,!js
package netns

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
// +build !windows
package netstat

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js
// +build js
package portmapper

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
// +build !js
// (no raw sockets in JS/WASM)

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd
// +build darwin freebsd
package routetable

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd
// +build darwin freebsd
package routetable

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin
// +build darwin
package routetable

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd
// +build freebsd
package routetable

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package routetable

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package routetable

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package tshttpproxy

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package tshttpproxy

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
// +build linux
package tshttpproxy

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
// +build !windows
package tstun

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
// +build !linux
package tstun

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
// +build !linux
package tstun

View File

@ -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.

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin && !ios
// +build darwin,!ios
package tstun

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
// +build !windows
package tstun

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !js
// +build !windows,!js
package paths

View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios && !js
// +build !ios,!js
package portlist

View File

@ -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

Some files were not shown because too many files have changed in this diff Show More