build: apply gofmt from golang 1.17

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
-// +build darwin
+//go:build brew && 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
-// +build cgo
-// +build !windows
+//go:build cmount && cgo && !windows
+// +build cmount,cgo,!windows
 
 package cmount
 

cmd/cmount/mountpoint_windows.go

@@ -1,6 +1,5 @@
-// +build cmount
-// +build cgo
-// +build windows
+//go:build cmount && cgo && windows
+// +build cmount,cgo,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
-// +build !freebsd
+//go:build !linux && !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,6 +1,7 @@
 // Package ncdu implements a text based user interface for exploring a remote
 
-//+build !plan9,!solaris,!js
+//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
-// +build !noselfupdate
+//go:build !windows && !plan9 && !js && !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
-// +build !noselfupdate
+//go:build windows && !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

cmd/serve/docker/unix.go

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

cmd/serve/docker/unix_unsupported.go

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

cmd/serve/ftp/ftp.go

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

cmd/serve/ftp/ftp_test.go

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

cmd/serve/ftp/ftp_unsupported.go

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

cmd/serve/http/data/assets_generate.go

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

cmd/serve/http/data/assets_vfsdata.go

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

cmd/serve/proxy/proxy_code.go

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

cmd/serve/servetest/proxy_code.go

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

cmd/serve/sftp/connection.go

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

cmd/serve/sftp/connection_test.go

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

cmd/serve/sftp/handler.go

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

cmd/serve/sftp/server.go

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

cmd/serve/sftp/sftp.go

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

cmd/serve/sftp/sftp_test.go

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

cmd/serve/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

cmd/serve/webdav/webdav_test.go

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

cmd/siginfo_darwin.go

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

cmd/siginfo_others.go

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