diff --git a/build.go b/build.go index 044a60ff3..94992dde4 100644 --- a/build.go +++ b/build.go @@ -36,7 +36,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //go:build ignore_build_go -// +build ignore_build_go package main diff --git a/cmd/restic/cmd_debug.go b/cmd/restic/cmd_debug.go index 2dd9d5cf0..d6e51107e 100644 --- a/cmd/restic/cmd_debug.go +++ b/cmd/restic/cmd_debug.go @@ -1,5 +1,4 @@ //go:build debug -// +build debug package main diff --git a/cmd/restic/cmd_mount.go b/cmd/restic/cmd_mount.go index a05f9c6b5..202109fa6 100644 --- a/cmd/restic/cmd_mount.go +++ b/cmd/restic/cmd_mount.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package main diff --git a/cmd/restic/cmd_mount_disabled.go b/cmd/restic/cmd_mount_disabled.go index 4d45cbb6f..9ab1a7f52 100644 --- a/cmd/restic/cmd_mount_disabled.go +++ b/cmd/restic/cmd_mount_disabled.go @@ -1,5 +1,4 @@ //go:build !darwin && !freebsd && !linux -// +build !darwin,!freebsd,!linux package main diff --git a/cmd/restic/cmd_mount_integration_test.go b/cmd/restic/cmd_mount_integration_test.go index 197b21d52..a5f4a7aef 100644 --- a/cmd/restic/cmd_mount_integration_test.go +++ b/cmd/restic/cmd_mount_integration_test.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package main diff --git a/cmd/restic/integration_helpers_unix_test.go b/cmd/restic/integration_helpers_unix_test.go index 30852a753..ffb2a9da6 100644 --- a/cmd/restic/integration_helpers_unix_test.go +++ b/cmd/restic/integration_helpers_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package main diff --git a/cmd/restic/integration_helpers_windows_test.go b/cmd/restic/integration_helpers_windows_test.go index 42ced7e46..887810cde 100644 --- a/cmd/restic/integration_helpers_windows_test.go +++ b/cmd/restic/integration_helpers_windows_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package main diff --git a/internal/archiver/archiver_unix_test.go b/internal/archiver/archiver_unix_test.go index 55f677cd8..978dc1b80 100644 --- a/internal/archiver/archiver_unix_test.go +++ b/internal/archiver/archiver_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package archiver diff --git a/internal/backend/local/local_unix.go b/internal/backend/local/local_unix.go index 164785c49..6a6880a2e 100644 --- a/internal/backend/local/local_unix.go +++ b/internal/backend/local/local_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package local diff --git a/internal/backend/rest/rest_unix_test.go b/internal/backend/rest/rest_unix_test.go index c4f08df0e..2c565f8da 100644 --- a/internal/backend/rest/rest_unix_test.go +++ b/internal/backend/rest/rest_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package rest_test diff --git a/internal/debug/round_tripper_debug.go b/internal/debug/round_tripper_debug.go index df207207b..f3b34ad42 100644 --- a/internal/debug/round_tripper_debug.go +++ b/internal/debug/round_tripper_debug.go @@ -1,5 +1,4 @@ //go:build debug -// +build debug package debug diff --git a/internal/debug/round_tripper_release.go b/internal/debug/round_tripper_release.go index 6edadb479..a42754c08 100644 --- a/internal/debug/round_tripper_release.go +++ b/internal/debug/round_tripper_release.go @@ -1,5 +1,4 @@ //go:build !debug -// +build !debug package debug diff --git a/internal/fs/const_unix.go b/internal/fs/const_unix.go index e570c2553..b75387394 100644 --- a/internal/fs/const_unix.go +++ b/internal/fs/const_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fs diff --git a/internal/fs/const_windows.go b/internal/fs/const_windows.go index b2b1bab86..8e7aebf6c 100644 --- a/internal/fs/const_windows.go +++ b/internal/fs/const_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/ea_windows.go b/internal/fs/ea_windows.go index e4c32057d..43bccd504 100644 --- a/internal/fs/ea_windows.go +++ b/internal/fs/ea_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/ea_windows_test.go b/internal/fs/ea_windows_test.go index 00cbe97f8..c61ea427d 100644 --- a/internal/fs/ea_windows_test.go +++ b/internal/fs/ea_windows_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/file_unix.go b/internal/fs/file_unix.go index 4e7765c30..9b33f1ab7 100644 --- a/internal/fs/file_unix.go +++ b/internal/fs/file_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fs diff --git a/internal/fs/fs_local_vss_test.go b/internal/fs/fs_local_vss_test.go index bae08bd10..9628cc4ef 100644 --- a/internal/fs/fs_local_vss_test.go +++ b/internal/fs/fs_local_vss_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/mknod_unix.go b/internal/fs/mknod_unix.go index 024c4d502..1ee6509b1 100644 --- a/internal/fs/mknod_unix.go +++ b/internal/fs/mknod_unix.go @@ -1,5 +1,4 @@ //go:build !freebsd && !windows -// +build !freebsd,!windows package fs diff --git a/internal/fs/node_freebsd.go b/internal/fs/node_freebsd.go index 0cbe876f1..37caba8f0 100644 --- a/internal/fs/node_freebsd.go +++ b/internal/fs/node_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package fs diff --git a/internal/fs/node_noxattr.go b/internal/fs/node_noxattr.go index c061d1777..3e3cdbd78 100644 --- a/internal/fs/node_noxattr.go +++ b/internal/fs/node_noxattr.go @@ -1,5 +1,4 @@ //go:build aix || dragonfly || openbsd -// +build aix dragonfly openbsd package fs diff --git a/internal/fs/node_unix.go b/internal/fs/node_unix.go index 0b43327c4..539b220db 100644 --- a/internal/fs/node_unix.go +++ b/internal/fs/node_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fs diff --git a/internal/fs/node_unix_test.go b/internal/fs/node_unix_test.go index 85aad2b48..4489f8f12 100644 --- a/internal/fs/node_unix_test.go +++ b/internal/fs/node_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fs diff --git a/internal/fs/node_windows_test.go b/internal/fs/node_windows_test.go index 173059325..06c7bd4ef 100644 --- a/internal/fs/node_windows_test.go +++ b/internal/fs/node_windows_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/node_xattr.go b/internal/fs/node_xattr.go index 546df1f37..d6289c74a 100644 --- a/internal/fs/node_xattr.go +++ b/internal/fs/node_xattr.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || netbsd || linux || solaris -// +build darwin freebsd netbsd linux solaris package fs diff --git a/internal/fs/node_xattr_all_test.go b/internal/fs/node_xattr_all_test.go index dd26c97b3..0a2a62c45 100644 --- a/internal/fs/node_xattr_all_test.go +++ b/internal/fs/node_xattr_all_test.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || netbsd || linux || solaris || windows -// +build darwin freebsd netbsd linux solaris windows package fs diff --git a/internal/fs/node_xattr_test.go b/internal/fs/node_xattr_test.go index 7205e1fbe..65aeb7d6d 100644 --- a/internal/fs/node_xattr_test.go +++ b/internal/fs/node_xattr_test.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || netbsd || linux || solaris -// +build darwin freebsd netbsd linux solaris package fs diff --git a/internal/fs/preallocate_other.go b/internal/fs/preallocate_other.go index 4fb44d421..b04d68738 100644 --- a/internal/fs/preallocate_other.go +++ b/internal/fs/preallocate_other.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin package fs diff --git a/internal/fs/priv.go b/internal/fs/priv.go index fc0089827..8cf8f4380 100644 --- a/internal/fs/priv.go +++ b/internal/fs/priv.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fs diff --git a/internal/fs/priv_windows.go b/internal/fs/priv_windows.go index 5268951e2..e78f61c1c 100644 --- a/internal/fs/priv_windows.go +++ b/internal/fs/priv_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/priv_windows_test.go b/internal/fs/priv_windows_test.go index 7851194a6..0db7144e8 100644 --- a/internal/fs/priv_windows_test.go +++ b/internal/fs/priv_windows_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/sd_windows_test.go b/internal/fs/sd_windows_test.go index c31b19b8b..56e5fde07 100644 --- a/internal/fs/sd_windows_test.go +++ b/internal/fs/sd_windows_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/sd_windows_test_helpers.go b/internal/fs/sd_windows_test_helpers.go index 0e888884a..14f3ead3a 100644 --- a/internal/fs/sd_windows_test_helpers.go +++ b/internal/fs/sd_windows_test_helpers.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/setflags_other.go b/internal/fs/setflags_other.go index 281aef093..2568181b4 100644 --- a/internal/fs/setflags_other.go +++ b/internal/fs/setflags_other.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package fs diff --git a/internal/fs/stat_bsd.go b/internal/fs/stat_bsd.go index 5a3704194..84155c82b 100644 --- a/internal/fs/stat_bsd.go +++ b/internal/fs/stat_bsd.go @@ -1,5 +1,4 @@ //go:build freebsd || netbsd -// +build freebsd netbsd package fs diff --git a/internal/fs/stat_darwin.go b/internal/fs/stat_darwin.go index ee39e8bfa..ec94d9f8b 100644 --- a/internal/fs/stat_darwin.go +++ b/internal/fs/stat_darwin.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package fs diff --git a/internal/fs/stat_unix.go b/internal/fs/stat_unix.go index 70124658f..176311f7e 100644 --- a/internal/fs/stat_unix.go +++ b/internal/fs/stat_unix.go @@ -1,5 +1,4 @@ //go:build !windows && !darwin && !freebsd && !netbsd -// +build !windows,!darwin,!freebsd,!netbsd package fs diff --git a/internal/fs/stat_windows.go b/internal/fs/stat_windows.go index a62ddf87f..bc4092df8 100644 --- a/internal/fs/stat_windows.go +++ b/internal/fs/stat_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fs/vss.go b/internal/fs/vss.go index 3215c9aa3..93b768dbc 100644 --- a/internal/fs/vss.go +++ b/internal/fs/vss.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fs diff --git a/internal/fs/vss_windows.go b/internal/fs/vss_windows.go index dabe78fb4..874953c5a 100644 --- a/internal/fs/vss_windows.go +++ b/internal/fs/vss_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package fs diff --git a/internal/fuse/dir.go b/internal/fuse/dir.go index 75fee3d17..28f7ba9a7 100644 --- a/internal/fuse/dir.go +++ b/internal/fuse/dir.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/file.go b/internal/fuse/file.go index 8ce90961f..42a83d652 100644 --- a/internal/fuse/file.go +++ b/internal/fuse/file.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/fuse_test.go b/internal/fuse/fuse_test.go index dc8128b65..05e6c5340 100644 --- a/internal/fuse/fuse_test.go +++ b/internal/fuse/fuse_test.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/inode.go b/internal/fuse/inode.go index b70180445..d334c8d73 100644 --- a/internal/fuse/inode.go +++ b/internal/fuse/inode.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/link.go b/internal/fuse/link.go index e37cb48f3..5f545cd8c 100644 --- a/internal/fuse/link.go +++ b/internal/fuse/link.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/other.go b/internal/fuse/other.go index 07ba0fe50..b9cba74a0 100644 --- a/internal/fuse/other.go +++ b/internal/fuse/other.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/root.go b/internal/fuse/root.go index 40f52ae5a..6b02238dd 100644 --- a/internal/fuse/root.go +++ b/internal/fuse/root.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/snapshots_dir.go b/internal/fuse/snapshots_dir.go index 4883b9ed8..645249417 100644 --- a/internal/fuse/snapshots_dir.go +++ b/internal/fuse/snapshots_dir.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/snapshots_dirstruct.go b/internal/fuse/snapshots_dirstruct.go index 141132abc..e9b7e7aa6 100644 --- a/internal/fuse/snapshots_dirstruct.go +++ b/internal/fuse/snapshots_dirstruct.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/snapshots_dirstruct_test.go b/internal/fuse/snapshots_dirstruct_test.go index 0295bca13..bd04af287 100644 --- a/internal/fuse/snapshots_dirstruct_test.go +++ b/internal/fuse/snapshots_dirstruct_test.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/tree_cache.go b/internal/fuse/tree_cache.go index d913f9b81..4b60aeb11 100644 --- a/internal/fuse/tree_cache.go +++ b/internal/fuse/tree_cache.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/fuse/xattr.go b/internal/fuse/xattr.go index f219c2a4b..26753e442 100644 --- a/internal/fuse/xattr.go +++ b/internal/fuse/xattr.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || linux -// +build darwin freebsd linux package fuse diff --git a/internal/global/global_debug.go b/internal/global/global_debug.go index be414ff80..c26009bac 100644 --- a/internal/global/global_debug.go +++ b/internal/global/global_debug.go @@ -1,5 +1,4 @@ //go:build debug || profile -// +build debug profile package global diff --git a/internal/global/global_release.go b/internal/global/global_release.go index f0c21ac60..a04ad0588 100644 --- a/internal/global/global_release.go +++ b/internal/global/global_release.go @@ -1,5 +1,4 @@ //go:build !debug && !profile -// +build !debug,!profile package global diff --git a/internal/restic/lock_unix.go b/internal/restic/lock_unix.go index 393dab5ba..ab54daf8e 100644 --- a/internal/restic/lock_unix.go +++ b/internal/restic/lock_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package restic diff --git a/internal/restorer/fileswriter_other_test.go b/internal/restorer/fileswriter_other_test.go index 530a190e5..756cb5bac 100644 --- a/internal/restorer/fileswriter_other_test.go +++ b/internal/restorer/fileswriter_other_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package restorer diff --git a/internal/restorer/restorer_unix.go b/internal/restorer/restorer_unix.go index 7316f7b5d..b013564f1 100644 --- a/internal/restorer/restorer_unix.go +++ b/internal/restorer/restorer_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package restorer diff --git a/internal/restorer/restorer_unix_test.go b/internal/restorer/restorer_unix_test.go index c4e8149b2..a7912ea03 100644 --- a/internal/restorer/restorer_unix_test.go +++ b/internal/restorer/restorer_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package restorer diff --git a/internal/restorer/restorer_windows.go b/internal/restorer/restorer_windows.go index 9ddc0a932..2be86c3a4 100644 --- a/internal/restorer/restorer_windows.go +++ b/internal/restorer/restorer_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package restorer diff --git a/internal/restorer/restorer_windows_test.go b/internal/restorer/restorer_windows_test.go index 348f02240..9bc680c51 100644 --- a/internal/restorer/restorer_windows_test.go +++ b/internal/restorer/restorer_windows_test.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package restorer diff --git a/internal/restorer/truncate_other.go b/internal/restorer/truncate_other.go index ed7ab04c5..25bdb52b3 100644 --- a/internal/restorer/truncate_other.go +++ b/internal/restorer/truncate_other.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package restorer diff --git a/internal/selfupdate/download_unix.go b/internal/selfupdate/download_unix.go index bc1762948..883733cd5 100644 --- a/internal/selfupdate/download_unix.go +++ b/internal/selfupdate/download_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package selfupdate diff --git a/internal/selfupdate/download_windows.go b/internal/selfupdate/download_windows.go index 50480eab6..3e771cfd0 100644 --- a/internal/selfupdate/download_windows.go +++ b/internal/selfupdate/download_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package selfupdate diff --git a/internal/terminal/foreground_test.go b/internal/terminal/foreground_test.go index c8392ab88..2e711cc1a 100644 --- a/internal/terminal/foreground_test.go +++ b/internal/terminal/foreground_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package terminal_test diff --git a/internal/terminal/terminal_unix.go b/internal/terminal/terminal_unix.go index 732219bb4..2065f50cf 100644 --- a/internal/terminal/terminal_unix.go +++ b/internal/terminal/terminal_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package terminal diff --git a/internal/terminal/terminal_windows.go b/internal/terminal/terminal_windows.go index fffabc5ee..163173286 100644 --- a/internal/terminal/terminal_windows.go +++ b/internal/terminal/terminal_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package terminal diff --git a/internal/ui/signals/signals_bsd.go b/internal/ui/signals/signals_bsd.go index d96e48c4e..d3318f5b0 100644 --- a/internal/ui/signals/signals_bsd.go +++ b/internal/ui/signals/signals_bsd.go @@ -1,5 +1,4 @@ //go:build darwin || dragonfly || freebsd || netbsd || openbsd -// +build darwin dragonfly freebsd netbsd openbsd package signals diff --git a/internal/ui/signals/signals_sysv.go b/internal/ui/signals/signals_sysv.go index 9480c1c99..e6472838f 100644 --- a/internal/ui/signals/signals_sysv.go +++ b/internal/ui/signals/signals_sysv.go @@ -1,5 +1,4 @@ //go:build aix || linux || solaris -// +build aix linux solaris package signals