build: remove build constraint syntax for go 1.16 and older

cmd/cachestats/cachestats.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 // Package cachestats provides the cachestats command.
 package cachestats

cmd/cachestats/cachestats_unsupported.go

@@ -2,6 +2,5 @@
 // about "no buildable Go source files "
 
 //go:build plan9 || js
-// +build plan9 js
 
 package cachestats

cmd/cmount/fs.go

@@ -1,6 +1,4 @@
 //go:build cmount && ((linux && cgo) || (darwin && cgo) || (freebsd && cgo) || windows)
-// +build cmount
-// +build linux,cgo darwin,cgo freebsd,cgo windows
 
 package cmount
 

cmd/cmount/mount.go

@@ -1,6 +1,4 @@
 //go:build cmount && ((linux && cgo) || (darwin && cgo) || (freebsd && cgo) || windows)
-// +build cmount
-// +build linux,cgo darwin,cgo freebsd,cgo windows
 
 // Package cmount implements a FUSE mounting system for rclone remotes.
 //

cmd/cmount/mount_brew.go

@@ -1,5 +1,4 @@
 //go:build brew && darwin
-// +build brew,darwin
 
 // Package cmount implements a FUSE mounting system for rclone remotes.
 //

cmd/cmount/mount_test.go

@@ -1,7 +1,4 @@
 //go:build cmount && ((linux && cgo) || (darwin && cgo) || (freebsd && cgo) || windows) && (!race || !windows)
-// +build cmount
-// +build linux,cgo darwin,cgo freebsd,cgo windows
-// +build !race !windows
 
 // Package cmount implements a FUSE mounting system for rclone remotes.
 //

cmd/cmount/mount_unsupported.go

@@ -1,8 +1,4 @@
 //go:build !((linux && cgo && cmount) || (darwin && cgo && cmount) || (freebsd && cgo && cmount) || (windows && cmount))
-// +build !linux !cgo !cmount
-// +build !darwin !cgo !cmount
-// +build !freebsd !cgo !cmount
-// +build !windows !cmount
 
 // Package cmount implements a FUSE mounting system for rclone remotes.
 //

cmd/cmount/mountpoint_other.go

@@ -1,5 +1,4 @@
 //go:build cmount && cgo && !windows
-// +build cmount,cgo,!windows
 
 package cmount
 

cmd/cmount/mountpoint_windows.go

@@ -1,5 +1,4 @@
 //go:build cmount && windows
-// +build cmount,windows
 
 package cmount
 

cmd/mount/dir.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mount
 

cmd/mount/file.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mount
 

cmd/mount/fs.go

@@ -1,7 +1,6 @@
 // FUSE main Fs
 
 //go:build linux
-// +build linux
 
 package mount
 

cmd/mount/handle.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mount
 

cmd/mount/mount.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 // Package mount implements a FUSE mounting system for rclone remotes.
 package mount

cmd/mount/mount_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mount
 

cmd/mount/mount_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 // Package mount implements a FUSE mounting system for rclone remotes.
 //

cmd/mount/test/seek_speed.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Read blocks out of a single file to time the seeking code
 package main

cmd/mount/test/seeker.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Read two files with lots of seeking to stress test the seek code
 package main

cmd/mount/test/seekers.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Read lots files with lots of simultaneous seeking to stress test the seek code
 package main

cmd/mount2/file.go

@@ -1,5 +1,4 @@
 //go:build linux || (darwin && amd64)
-// +build linux darwin,amd64
 
 package mount2
 

cmd/mount2/fs.go

@@ -1,7 +1,6 @@
 // FUSE main Fs
 
 //go:build linux || (darwin && amd64)
-// +build linux darwin,amd64
 
 package mount2
 

cmd/mount2/mount.go

@@ -1,5 +1,4 @@
 //go:build linux || (darwin && amd64)
-// +build linux darwin,amd64
 
 // Package mount2 implements a FUSE mounting system for rclone remotes.
 package mount2

cmd/mount2/mount_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mount2
 

cmd/mount2/mount_unsupported.go

@@ -1,6 +1,4 @@
 //go:build !linux && (!darwin || !amd64)
-// +build !linux
-// +build !darwin !amd64
 
 // Package mount2 implements a FUSE mounting system for rclone remotes.
 //

cmd/mount2/node.go

@@ -1,5 +1,4 @@
 //go:build linux || (darwin && amd64)
-// +build linux darwin,amd64
 
 package mount2
 

cmd/mountlib/check_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mountlib
 

cmd/mountlib/check_other.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package mountlib
 

cmd/mountlib/sighup.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 package mountlib
 

cmd/mountlib/sighup_unsupported.go

@@ -1,5 +1,4 @@
 //go:build plan9 || js
-// +build plan9 js
 
 package mountlib
 

cmd/ncdu/ncdu.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 // Package ncdu implements a text based user interface for exploring a remote
 package ncdu

cmd/ncdu/ncdu_unsupported.go

@@ -2,6 +2,5 @@
 // about "no buildable Go source files "
 
 //go:build plan9 || js
-// +build plan9 js
 
 package ncdu

cmd/nfsmount/nfsmount.go

@@ -1,5 +1,4 @@
 //go:build unix
-// +build unix
 
 // Package nfsmount implements mounting functionality using serve nfs command
 //

cmd/nfsmount/nfsmount_test.go

@@ -1,5 +1,4 @@
 //go:build darwin && !cmount
-// +build darwin,!cmount
 
 package nfsmount
 

cmd/nfsmount/nfsmount_unsupported.go

@@ -2,7 +2,6 @@
 // about "no buildable Go source files "
 
 //go:build !unix
-// +build !unix
 
 // Package nfsmount implements mount command using NFS.
 package nfsmount

cmd/selfupdate/noselfupdate.go

@@ -1,5 +1,4 @@
 //go:build noselfupdate
-// +build noselfupdate
 
 package selfupdate
 

cmd/selfupdate/selfupdate.go

@@ -1,5 +1,4 @@
 //go:build !noselfupdate
-// +build !noselfupdate
 
 // Package selfupdate provides the selfupdate command.
 package selfupdate

cmd/selfupdate/selfupdate_test.go

@@ -1,5 +1,4 @@
 //go:build !noselfupdate
-// +build !noselfupdate
 
 package selfupdate
 

cmd/selfupdate/verify.go

@@ -1,5 +1,4 @@
 //go:build !noselfupdate
-// +build !noselfupdate
 
 package selfupdate
 

cmd/selfupdate/verify_test.go

@@ -1,5 +1,4 @@
 //go:build !noselfupdate
-// +build !noselfupdate
 
 package selfupdate
 

cmd/selfupdate/writable_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js && !noselfupdate
-// +build !windows,!plan9,!js,!noselfupdate
 
 package selfupdate
 

cmd/selfupdate/writable_unsupported.go

@@ -1,6 +1,4 @@
 //go:build (plan9 || js) && !noselfupdate
-// +build plan9 js
-// +build !noselfupdate
 
 package selfupdate
 

cmd/selfupdate/writable_windows.go

@@ -1,5 +1,4 @@
 //go:build windows && !noselfupdate
-// +build windows,!noselfupdate
 
 package selfupdate
 

cmd/selfupdate_disabled.go

@@ -1,5 +1,4 @@
 //go:build noselfupdate
-// +build noselfupdate
 
 package cmd
 

cmd/selfupdate_enabled.go

@@ -1,5 +1,4 @@
 //go:build !noselfupdate
-// +build !noselfupdate
 
 package cmd
 

cmd/serve/dlna/data/assets_generate.go

@@ -1,7 +1,6 @@
 //go:generate go run assets_generate.go
 // The "go:generate" directive compiles static assets by running assets_generate.go
 //go:build ignore
-// +build ignore
 
 package main
 

cmd/serve/docker/docker_test.go

@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 package docker_test
 

cmd/serve/docker/systemd.go

@@ -1,5 +1,4 @@
 //go:build linux && !android
-// +build linux,!android
 
 package docker
 

cmd/serve/docker/systemd_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux || android
-// +build !linux android
 
 package docker
 

cmd/serve/docker/unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package docker
 

cmd/serve/docker/unix_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package docker
 

cmd/serve/ftp/ftp.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 // Package ftp implements an FTP server for rclone
 package ftp

cmd/serve/ftp/ftp_test.go

@@ -4,7 +4,6 @@
 // We skip tests on platforms with troublesome character mappings
 
 //go:build !windows && !darwin && !plan9
-// +build !windows,!darwin,!plan9
 
 package ftp
 

cmd/serve/ftp/ftp_unsupported.go

@@ -2,7 +2,6 @@
 // about "no buildable Go source files "
 
 //go:build plan9
-// +build plan9
 
 package ftp
 

cmd/serve/nfs/filesystem.go

@@ -1,5 +1,4 @@
 //go:build unix
-// +build unix
 
 package nfs
 

cmd/serve/nfs/handler.go

@@ -1,5 +1,4 @@
 //go:build unix
-// +build unix
 
 package nfs
 

cmd/serve/nfs/nfs.go

@@ -1,5 +1,4 @@
 //go:build unix
-// +build unix
 
 // Package nfs implements a server to serve a VFS remote over NFSv3 protocol
 //

cmd/serve/nfs/nfs_unsupported.go

@@ -1,6 +1,5 @@
 // For unsupported architectures
 //go:build !unix
-// +build !unix
 
 // Package nfs is not supported on non-Unix platforms
 package nfs

cmd/serve/nfs/server.go

@@ -1,5 +1,4 @@
 //go:build unix
-// +build unix
 
 package nfs
 

cmd/serve/proxy/proxy_code.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // A simple auth proxy for testing purposes
 package main

cmd/serve/servetest/proxy_code.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // A simple auth proxy for testing purposes
 package main

cmd/serve/sftp/connection.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 package sftp
 

cmd/serve/sftp/connection_test.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 package sftp
 

cmd/serve/sftp/handler.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 package sftp
 

cmd/serve/sftp/server.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 package sftp
 

cmd/serve/sftp/sftp.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 // Package sftp implements an SFTP server to serve an rclone VFS
 package sftp

cmd/serve/sftp/sftp_test.go

@@ -4,7 +4,6 @@
 // We skip tests on platforms with troublesome character mappings
 
 //go:build !windows && !darwin && !plan9
-// +build !windows,!darwin,!plan9
 
 package sftp
 

cmd/serve/sftp/sftp_unsupported.go

@@ -2,7 +2,6 @@
 // about "no buildable Go source files "
 
 //go:build plan9
-// +build plan9
 
 package sftp
 

cmd/serve/webdav/webdav_test.go

@@ -4,7 +4,6 @@
 // We skip tests on platforms with troublesome character mappings
 
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 package webdav
 

cmd/siginfo_bsd.go

@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || netbsd || dragonfly || openbsd
-// +build darwin freebsd netbsd dragonfly openbsd
 
 package cmd
 

cmd/siginfo_others.go

@@ -1,5 +1,4 @@
 //go:build !darwin && !freebsd && !netbsd && !dragonfly && !openbsd
-// +build !darwin,!freebsd,!netbsd,!dragonfly,!openbsd
 
 package cmd