all: Update build constraints to Go 1.17 style (#7894)

syncthing · Aug 17, 2021 · d47745a · d47745a
1 parent 8c94ce8
commit d47745a
Show file tree

Hide file tree

Showing 81 changed files with 86 additions and 5 deletions.
diff --git a/build.go b/build.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main

diff --git a/cmd/strelaypoolsrv/auto/noassets.go b/cmd/strelaypoolsrv/auto/noassets.go
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build noassets
+//go:build noassets
+// +build noassets
 
 package auto
 

diff --git a/cmd/syncthing/openurl_unix.go b/cmd/syncthing/openurl_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/syncthing/openurl_windows.go b/cmd/syncthing/openurl_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package main

diff --git a/cmd/syncthing/options_others.go b/cmd/syncthing/options_others.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/syncthing/perfstats_unix.go b/cmd/syncthing/perfstats_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !solaris && !windows
 // +build !solaris,!windows
 
 package main

diff --git a/cmd/syncthing/perfstats_unsupported.go b/cmd/syncthing/perfstats_unsupported.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build solaris || windows
 // +build solaris windows
 
 package main

diff --git a/cmd/syncthing/traceback.go b/cmd/syncthing/traceback.go
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build go1.7
+//go:build go1.7
+// +build go1.7
 
 package main
 

diff --git a/lib/api/auto/noassets.go b/lib/api/auto/noassets.go
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build noassets
+//go:build noassets
+// +build noassets
 
 package auto
 

diff --git a/lib/build/tags_race.go b/lib/build/tags_race.go
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build race
+//go:build race
+// +build race
 
 package build
 

diff --git a/lib/connections/quic_dial.go b/lib/connections/quic_dial.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build go1.14 && !noquic && !go1.17
 // +build go1.14,!noquic,!go1.17
 
 package connections

diff --git a/lib/connections/quic_listen.go b/lib/connections/quic_listen.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build go1.14 && !noquic && !go1.17
 // +build go1.14,!noquic,!go1.17
 
 package connections

diff --git a/lib/connections/quic_misc.go b/lib/connections/quic_misc.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build go1.14 && !noquic && !go1.17
 // +build go1.14,!noquic,!go1.17
 
 package connections

diff --git a/lib/connections/quic_unsupported.go b/lib/connections/quic_unsupported.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build noquic || !go1.14 || go1.17
 // +build noquic !go1.14 go1.17
 
 package connections

diff --git a/lib/dialer/control_unix.go b/lib/dialer/control_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !solaris && !windows
 // +build !solaris,!windows
 
 package dialer

diff --git a/lib/dialer/control_unsupported.go b/lib/dialer/control_unsupported.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build solaris
 // +build solaris
 
 package dialer

diff --git a/lib/dialer/control_windows.go b/lib/dialer/control_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package dialer

diff --git a/lib/fs/basicfs_copy_range_copyfilerange.go b/lib/fs/basicfs_copy_range_copyfilerange.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

diff --git a/lib/fs/basicfs_copy_range_duplicateextents.go b/lib/fs/basicfs_copy_range_duplicateextents.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

diff --git a/lib/fs/basicfs_copy_range_ioctl.go b/lib/fs/basicfs_copy_range_ioctl.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

diff --git a/lib/fs/basicfs_copy_range_sendfile.go b/lib/fs/basicfs_copy_range_sendfile.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux || solaris
 // +build linux solaris
 
 package fs

diff --git a/lib/fs/basicfs_fileinfo_unix.go b/lib/fs/basicfs_fileinfo_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package fs

diff --git a/lib/fs/basicfs_lstat_broken.go b/lib/fs/basicfs_lstat_broken.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux || android
 // +build linux android
 
 package fs

diff --git a/lib/fs/basicfs_lstat_regular.go b/lib/fs/basicfs_lstat_regular.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !linux && !android && !windows
 // +build !linux,!android,!windows
 
 package fs

diff --git a/lib/fs/basicfs_lstat_windows.go b/lib/fs/basicfs_lstat_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

diff --git a/lib/fs/basicfs_unix.go b/lib/fs/basicfs_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package fs

diff --git a/lib/fs/basicfs_watch.go b/lib/fs/basicfs_watch.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build (!solaris && !darwin) || (solaris && cgo) || (darwin && cgo)
 // +build !solaris,!darwin solaris,cgo darwin,cgo
 
 package fs

diff --git a/lib/fs/basicfs_watch_errors_linux.go b/lib/fs/basicfs_watch_errors_linux.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

diff --git a/lib/fs/basicfs_watch_errors_others.go b/lib/fs/basicfs_watch_errors_others.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build !linux
 // +build !linux
 
 package fs

diff --git a/lib/fs/basicfs_watch_eventtypes_darwin.go b/lib/fs/basicfs_watch_eventtypes_darwin.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build darwin && !kqueue && cgo
 // +build darwin,!kqueue,cgo
 
 package fs

diff --git a/lib/fs/basicfs_watch_eventtypes_fen.go b/lib/fs/basicfs_watch_eventtypes_fen.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build solaris && cgo
 // +build solaris,cgo
 
 package fs

diff --git a/lib/fs/basicfs_watch_eventtypes_inotify.go b/lib/fs/basicfs_watch_eventtypes_inotify.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

diff --git a/lib/fs/basicfs_watch_eventtypes_kqueue.go b/lib/fs/basicfs_watch_eventtypes_kqueue.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build dragonfly || freebsd || netbsd || openbsd
 // +build dragonfly freebsd netbsd openbsd
 
 package fs

diff --git a/lib/fs/basicfs_watch_eventtypes_other.go b/lib/fs/basicfs_watch_eventtypes_other.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build !linux && !windows && !dragonfly && !freebsd && !netbsd && !openbsd && !solaris && !darwin && !cgo
 // +build !linux,!windows,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris,!darwin,!cgo
 
 // Catch all platforms that are not specifically handled to use the generic

diff --git a/lib/fs/basicfs_watch_eventtypes_readdcw.go b/lib/fs/basicfs_watch_eventtypes_readdcw.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

diff --git a/lib/fs/basicfs_watch_test.go b/lib/fs/basicfs_watch_test.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build (!solaris && !darwin) || (solaris && cgo) || (darwin && cgo)
 // +build !solaris,!darwin solaris,cgo darwin,cgo
 
 package fs

diff --git a/lib/fs/basicfs_watch_unsupported.go b/lib/fs/basicfs_watch_unsupported.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build (solaris && !cgo) || (darwin && !cgo)
 // +build solaris,!cgo darwin,!cgo
 
 package fs

diff --git a/lib/fs/basicfs_windows.go b/lib/fs/basicfs_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

diff --git a/lib/fs/basicfs_windows_test.go b/lib/fs/basicfs_windows_test.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

diff --git a/lib/fs/debug_symlink_unix.go b/lib/fs/debug_symlink_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package fs

diff --git a/lib/osutil/atomic_unix_test.go b/lib/osutil/atomic_unix_test.go
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build !windows
+//go:build !windows
+// +build !windows
 
 // (No syscall.Umask or the equivalent on Windows)
 

diff --git a/lib/osutil/filenames_unix.go b/lib/osutil/filenames_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 package osutil

diff --git a/lib/osutil/hidden_unix.go b/lib/osutil/hidden_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package osutil

diff --git a/lib/osutil/hidden_windows.go b/lib/osutil/hidden_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package osutil

diff --git a/lib/osutil/lowprio_linux.go b/lib/osutil/lowprio_linux.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !android
 // +build !android
 
 package osutil

diff --git a/lib/osutil/lowprio_unix.go b/lib/osutil/lowprio_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build (!windows && !linux) || android
 // +build !windows,!linux android
 
 package osutil

diff --git a/lib/osutil/rlimit_unix.go b/lib/osutil/rlimit_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package osutil

diff --git a/lib/osutil/rlimit_windows.go b/lib/osutil/rlimit_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package osutil