build: remove build constraint syntax for go 1.16 and older

backend/azureblob/azureblob.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !solaris && !js
-// +build !plan9,!solaris,!js
 
 // Package azureblob provides an interface to the Microsoft Azure blob object storage system
 package azureblob

backend/azureblob/azureblob_internal_test.go

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

backend/azureblob/azureblob_test.go

@@ -1,7 +1,6 @@
 // Test AzureBlob filesystem interface
 
 //go:build !plan9 && !solaris && !js
-// +build !plan9,!solaris,!js
 
 package azureblob
 

backend/azureblob/azureblob_unsupported.go

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

backend/azurefiles/azurefiles.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 // Package azurefiles provides an interface to Microsoft Azure Files
 package azurefiles

backend/azurefiles/azurefiles_internal_test.go

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

backend/azurefiles/azurefiles_test.go

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

backend/azurefiles/azurefiles_unsupported.go

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

backend/cache/cache.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 // Package cache implements a virtual provider to cache existing remotes.
 package cache

backend/cache/cache_internal_test.go

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

backend/cache/cache_test.go

@@ -1,7 +1,6 @@
 // Test Cache filesystem interface
 
 //go:build !plan9 && !js && !race
-// +build !plan9,!js,!race
 
 package cache_test
 

backend/cache/cache_unsupported.go

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

backend/cache/cache_upload_test.go

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

backend/cache/directory.go

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

backend/cache/handle.go

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

backend/cache/object.go

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

backend/cache/plex.go

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

backend/cache/storage_memory.go

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

backend/cache/storage_persistent.go

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

backend/hdfs/fs.go

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

backend/hdfs/hdfs.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 // Package hdfs provides an interface to the HDFS storage system.
 package hdfs

backend/hdfs/hdfs_test.go

@@ -1,7 +1,6 @@
 // Test HDFS filesystem interface
 
 //go:build !plan9
-// +build !plan9
 
 package hdfs_test
 

backend/hdfs/hdfs_unsupported.go

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

backend/hdfs/object.go

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

backend/local/about_unix.go

@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || linux
-// +build darwin dragonfly freebsd linux
 
 package local
 

backend/local/about_windows.go

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

backend/local/fadvise_other.go

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

backend/local/fadvise_unix.go

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

backend/local/lchtimes.go

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

backend/local/lchtimes_unix.go

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

backend/local/metadata_bsd.go

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

backend/local/metadata_linux.go

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

backend/local/metadata_other.go

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

backend/local/metadata_unix.go

@@ -1,5 +1,4 @@
 //go:build openbsd || solaris
-// +build openbsd solaris
 
 package local
 

backend/local/metadata_windows.go

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

backend/local/read_device_other.go

@@ -1,7 +1,6 @@
 // Device reading functions
 
 //go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris
-// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
 
 package local
 

backend/local/read_device_unix.go

@@ -1,7 +1,6 @@
 // Device reading functions
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package local
 

backend/local/remove_other.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package local
 

backend/local/remove_windows.go

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

backend/local/setbtime.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package local
 

backend/local/setbtime_windows.go

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

backend/local/symlink.go

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

backend/local/symlink_other.go

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

backend/local/xattr.go

@@ -1,5 +1,4 @@
 //go:build !openbsd && !plan9
-// +build !openbsd,!plan9
 
 package local
 

backend/local/xattr_unsupported.go

@@ -1,5 +1,4 @@
 //go:build openbsd || plan9
-// +build openbsd plan9
 
 // The pkg/xattr module doesn't compile for openbsd or plan9
 package local

backend/oracleobjectstorage/byok.go

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

backend/oracleobjectstorage/client.go

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

backend/oracleobjectstorage/command.go

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

backend/oracleobjectstorage/copy.go

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

backend/oracleobjectstorage/multipart.go

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

backend/oracleobjectstorage/object.go

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

backend/oracleobjectstorage/options.go

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

backend/oracleobjectstorage/oracleobjectstorage.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !solaris && !js
-// +build !plan9,!solaris,!js
 
 // Package oracleobjectstorage provides an interface to the OCI object storage system.
 package oracleobjectstorage

backend/oracleobjectstorage/oracleobjectstorage_test.go

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

backend/oracleobjectstorage/oracleobjectstorage_unsupported.go

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

backend/oracleobjectstorage/waiter.go

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

backend/qingstor/qingstor.go

@@ -1,5 +1,4 @@
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 // Package qingstor provides an interface to QingStor object storage
 // Home: https://www.qingcloud.com/

backend/qingstor/qingstor_test.go

@@ -1,7 +1,6 @@
 // Test QingStor filesystem interface
 
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 package qingstor
 

backend/qingstor/qingstor_unsupported.go

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

backend/qingstor/upload.go

@@ -1,7 +1,6 @@
 // Upload object to QingStor
 
 //go:build !plan9 && !js
-// +build !plan9,!js
 
 package qingstor
 

backend/s3/gen_setfrom.go

@@ -1,7 +1,6 @@
 // Generate boilerplate code for setting similar structs from each other
 
 //go:build ignore
-// +build ignore
 
 package main
 

backend/sftp/sftp.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 // Package sftp provides a filesystem interface using github.com/pkg/sftp
 package sftp

backend/sftp/sftp_internal_test.go

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

backend/sftp/sftp_test.go

@@ -1,7 +1,6 @@
 // Test Sftp filesystem interface
 
 //go:build !plan9
-// +build !plan9
 
 package sftp_test
 

backend/sftp/sftp_unsupported.go

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

backend/sftp/ssh.go

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

backend/sftp/ssh_external.go

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

backend/sftp/ssh_internal.go

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

backend/sftp/stringlock.go

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

backend/sftp/stringlock_test.go

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

backend/sharefile/generate_tzdata.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 

backend/storj/fs.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 // Package storj provides an interface to Storj decentralized object storage.
 package storj

backend/storj/object.go

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

backend/storj/storj_test.go

@@ -1,5 +1,4 @@
 //go:build !plan9
-// +build !plan9
 
 // Test Storj filesystem interface
 package storj_test

backend/storj/storj_unsupported.go

@@ -1,4 +1,3 @@
 //go:build plan9
-// +build plan9
 
 package storj

backend/union/errors_test.go

@@ -1,5 +1,4 @@
 //go:build go1.20
-// +build go1.20
 
 package union
 

bin/check-merged.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Attempt to work out if branches have already been merged
 package main

bin/cross-compile.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Cross compile rclone - in go because I hate bash ;-)
 

bin/get-github-release.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Get the latest release from a github project
 //

bin/resource_windows.go

@@ -16,7 +16,6 @@
 
 //go:generate go run resource_windows.go
 //go:build tools
-// +build tools
 
 package main
 

bin/test_independence.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Test that the tests in the suite passed in are independent
 

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