build: apply gofmt from golang 1.17

backend/amazonclouddrive/amazonclouddrive_test.go

@@ -1,5 +1,6 @@
 // Test AmazonCloudDrive filesystem interface
 
+//go:build acd
 // +build acd
 
 package amazonclouddrive_test

backend/azureblob/azureblob.go

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

backend/azureblob/azureblob_internal_test.go

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

backend/azureblob/azureblob_test.go

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

backend/azureblob/azureblob_unsupported.go

@@ -1,6 +1,7 @@
 // Build for azureblob for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9 || solaris || js
 // +build plan9 solaris js
 
 package azureblob

backend/azureblob/imds.go

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

backend/azureblob/imds_test.go

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

backend/cache/cache.go

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

backend/cache/cache_internal_test.go

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

backend/cache/cache_test.go

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

backend/cache/cache_unsupported.go

@@ -1,6 +1,7 @@
 // Build for cache for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9 || js
 // +build plan9 js
 
 package cache

backend/cache/cache_upload_test.go

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

backend/cache/directory.go

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

backend/cache/handle.go

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

backend/cache/object.go

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

backend/cache/plex.go

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

backend/cache/storage_memory.go

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

backend/cache/storage_persistent.go

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

backend/hdfs/fs.go

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

backend/hdfs/hdfs.go

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

backend/hdfs/hdfs_test.go

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

backend/hdfs/hdfs_unsupported.go

@@ -1,6 +1,7 @@
 // Build for hdfs for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9
 // +build plan9
 
 package hdfs

backend/hdfs/object.go

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

backend/local/about_unix.go

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

backend/local/about_windows.go

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

backend/local/fadvise_other.go

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

backend/local/fadvise_unix.go

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

backend/local/lchtimes.go

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

backend/local/lchtimes_unix.go

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

backend/local/read_device_other.go

@@ -1,5 +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,5 +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,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package local

backend/local/remove_windows.go

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

backend/local/symlink.go

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

backend/local/symlink_other.go

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

backend/qingstor/qingstor.go

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

backend/qingstor/qingstor_test.go

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

backend/qingstor/qingstor_unsupported.go

@@ -1,6 +1,7 @@
 // Build for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9 || js
 // +build plan9 js
 
 package qingstor

backend/qingstor/upload.go

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

backend/sftp/sftp.go

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

backend/sftp/sftp_internal_test.go

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

backend/sftp/sftp_test.go

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

backend/sftp/sftp_unsupported.go

@@ -1,6 +1,7 @@
 // Build for sftp for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9
 // +build plan9
 
 package sftp

backend/sftp/stringlock.go

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

backend/sftp/stringlock_test.go

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

backend/sharefile/generate_tzdata.go

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

backend/sharefile/tzdata_vfsdata.go

@@ -1,5 +1,6 @@
 // Code generated by vfsgen; DO NOT EDIT.
 
+//go:build !dev
 // +build !dev
 
 package sharefile

backend/tardigrade/fs.go

@@ -1,3 +1,4 @@
+//go:build !plan9
 // +build !plan9
 
 // Package tardigrade provides an interface to Tardigrade decentralized object storage.

backend/tardigrade/object.go

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

backend/tardigrade/tardigrade_test.go

@@ -1,3 +1,4 @@
+//go:build !plan9
 // +build !plan9
 
 // Test Tardigrade filesystem interface

backend/tardigrade/tardigrade_unsupported.go

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

bin/check-merged.go

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

bin/cross-compile.go

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

bin/get-github-release.go

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

bin/test_independence.go

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

cmd/cachestats/cachestats.go

@@ -1,3 +1,4 @@
+//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cachestats

cmd/cachestats/cachestats_unsupported.go

@@ -1,6 +1,7 @@
 // Build for cache for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9 || js
 // +build plan9 js
 
 package cachestats

cmd/cmount/fs.go

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

cmd/cmount/mount.go

@@ -2,6 +2,7 @@
 //
 // This uses the cgo based cgofuse library
 
+//go:build cmount && cgo && (linux || darwin || freebsd || windows)
 // +build cmount
 // +build cgo
 // +build linux darwin freebsd windows

cmd/cmount/mount_brew.go

@@ -1,8 +1,8 @@
 // Build for macos with the brew tag to handle the absence
 // of fuse and print an appropriate error message
 
-// +build brew
+//go:build brew && darwin
-// +build darwin
+// +build brew,darwin
 
 package cmount
 

cmd/cmount/mount_test.go

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

cmd/cmount/mount_unsupported.go

@@ -1,6 +1,7 @@
 // Build for cmount for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build (!linux && !darwin && !freebsd && !windows) || !brew || !cgo || !cmount
 // +build !linux,!darwin,!freebsd,!windows !brew !cgo !cmount
 
 package cmount

cmd/cmount/mountpoint_other.go

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

cmd/cmount/mountpoint_windows.go

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

cmd/mount/dir.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/file.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/fs.go

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

cmd/mount/handle.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/mount.go

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

cmd/mount/mount_test.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/mount_unsupported.go

@@ -3,7 +3,7 @@
 
 // Invert the build constraint: linux freebsd
 
-// +build !linux
+//go:build !linux && !freebsd
-// +build !freebsd
+// +build !linux,!freebsd
 
 package mount

cmd/mount/test/seek_speed.go

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

cmd/mount/test/seeker.go

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

cmd/mount/test/seekers.go

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

cmd/mount2/file.go

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

cmd/mount2/fs.go

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

cmd/mount2/mount.go

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

cmd/mount2/mount_test.go

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

cmd/mount2/mount_unsupported.go

@@ -1,6 +1,7 @@
 // Build for mount for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build !linux && (!darwin || !amd64)
 // +build !linux
 // +build !darwin !amd64
 

cmd/mount2/node.go

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

cmd/mountlib/daemon.go

@@ -1,5 +1,6 @@
 // Daemonization interface for non-Unix variants only
 
+//go:build windows || plan9 || js
 // +build windows plan9 js
 
 package mountlib

cmd/mountlib/daemon_unix.go

@@ -1,5 +1,6 @@
 // Daemonization interface for Unix variants only
 
+//go:build !windows && !plan9 && !js
 // +build !windows,!plan9,!js
 
 package mountlib

cmd/mountlib/sighup.go

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

cmd/mountlib/sighup_unsupported.go

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

cmd/ncdu/ncdu.go

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

cmd/ncdu/ncdu_unsupported.go

@@ -1,6 +1,7 @@
 // Build for ncdu for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
+//go:build plan9 || solaris || js
 // +build plan9 solaris js
 
 package ncdu

cmd/selfupdate/help.go

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

cmd/selfupdate/noselfupdate.go

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

cmd/selfupdate/selfupdate.go

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

cmd/selfupdate/selfupdate_test.go

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

cmd/selfupdate/verify.go

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

cmd/selfupdate/writable_unix.go

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

cmd/selfupdate/writable_unsupported.go

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

cmd/selfupdate/writable_windows.go

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

cmd/selfupdate_disabled.go

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

cmd/selfupdate_enabled.go

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

cmd/serve/dlna/data/assets_generate.go

@@ -1,5 +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/dlna/data/assets_vfsdata.go

@@ -1,5 +1,6 @@
 // Code generated by vfsgen; DO NOT EDIT.
 
+//go:build !dev
 // +build !dev
 
 package data

cmd/serve/docker/systemd.go

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

cmd/serve/docker/systemd_unsupported.go

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