From 433b9755fb2e7489793942d7e7d795c91ded249a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 26 Oct 2024 13:11:35 +0200 Subject: [PATCH] go-fix: remove pre-go1.17 build-tags Result of; go fix -mod=readonly ./... cd cmd/continuity go fix -mod=readonly ./... Signed-off-by: Sebastiaan van Stijn --- cmd/continuity/commands/mount.go | 1 - cmd/continuity/commands/mount_unsupported.go | 1 - cmd/continuity/continuityfs/fuse.go | 1 - devices/devices_unix.go | 1 - devices/mknod_freebsd.go | 1 - devices/mknod_unix.go | 1 - driver/driver_unix.go | 1 - driver/driver_windows.go | 1 - driver/lchmod_unix.go | 1 - fs/copy_irregular_unix.go | 1 - fs/copy_linux_test.go | 1 - fs/copy_nondarwin.go | 1 - fs/copy_unix.go | 1 - fs/copy_unix_test.go | 1 - fs/diff_nonlinux.go | 1 - fs/diff_unix.go | 1 - fs/dtype_linux.go | 1 - fs/dtype_linux_test.go | 1 - fs/du_cmd_freebsddarwin_test.go | 1 - fs/du_cmd_unix_test.go | 1 - fs/du_unix.go | 1 - fs/du_unix_test.go | 1 - fs/du_windows.go | 1 - fs/fstest/compare_unix.go | 1 - fs/fstest/file_unix.go | 1 - fs/hardlink_unix.go | 1 - fs/path_test.go | 1 - fs/stat_darwinbsd.go | 1 - fs/stat_unix.go | 1 - fs/utimesnanoat.go | 1 - hardlinks_unix.go | 1 - manifest_test.go | 1 - manifest_test_darwin.go | 1 - resource_unix.go | 1 - sysx/nodata_unix.go | 1 - sysx/xattr.go | 1 - sysx/xattr_unsupported.go | 1 - testutil/helpers_unix.go | 1 - testutil/mount_other.go | 1 - 39 files changed, 39 deletions(-) diff --git a/cmd/continuity/commands/mount.go b/cmd/continuity/commands/mount.go index 05a880f8..3d75be18 100644 --- a/cmd/continuity/commands/mount.go +++ b/cmd/continuity/commands/mount.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd /* Copyright The containerd Authors. diff --git a/cmd/continuity/commands/mount_unsupported.go b/cmd/continuity/commands/mount_unsupported.go index d9fdba2d..0756a158 100644 --- a/cmd/continuity/commands/mount_unsupported.go +++ b/cmd/continuity/commands/mount_unsupported.go @@ -1,5 +1,4 @@ //go:build windows || solaris || openbsd || netbsd || dragonfly || darwin -// +build windows solaris openbsd netbsd dragonfly darwin /* Copyright The containerd Authors. diff --git a/cmd/continuity/continuityfs/fuse.go b/cmd/continuity/continuityfs/fuse.go index 27809fe1..70d409af 100644 --- a/cmd/continuity/continuityfs/fuse.go +++ b/cmd/continuity/continuityfs/fuse.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd /* Copyright The containerd Authors. diff --git a/devices/devices_unix.go b/devices/devices_unix.go index 3dd3bb42..451979b7 100644 --- a/devices/devices_unix.go +++ b/devices/devices_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/devices/mknod_freebsd.go b/devices/mknod_freebsd.go index 2f73fbb6..9a058ba7 100644 --- a/devices/mknod_freebsd.go +++ b/devices/mknod_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd || dragonfly -// +build freebsd dragonfly /* Copyright The containerd Authors. diff --git a/devices/mknod_unix.go b/devices/mknod_unix.go index 5c7f5525..6f630432 100644 --- a/devices/mknod_unix.go +++ b/devices/mknod_unix.go @@ -1,5 +1,4 @@ //go:build !(freebsd || windows) -// +build !freebsd,!windows /* Copyright The containerd Authors. diff --git a/driver/driver_unix.go b/driver/driver_unix.go index 6089c51d..ea205f4a 100644 --- a/driver/driver_unix.go +++ b/driver/driver_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/driver/driver_windows.go b/driver/driver_windows.go index f539feec..637b9c27 100644 --- a/driver/driver_windows.go +++ b/driver/driver_windows.go @@ -1,5 +1,4 @@ //go:build go1.13 -// +build go1.13 /* Copyright The containerd Authors. diff --git a/driver/lchmod_unix.go b/driver/lchmod_unix.go index 724a6ae0..17617525 100644 --- a/driver/lchmod_unix.go +++ b/driver/lchmod_unix.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || netbsd || openbsd || dragonfly || solaris -// +build darwin freebsd netbsd openbsd dragonfly solaris /* Copyright The containerd Authors. diff --git a/fs/copy_irregular_unix.go b/fs/copy_irregular_unix.go index 99fc8a96..0478f706 100644 --- a/fs/copy_irregular_unix.go +++ b/fs/copy_irregular_unix.go @@ -1,5 +1,4 @@ //go:build !windows && !freebsd -// +build !windows,!freebsd /* Copyright The containerd Authors. diff --git a/fs/copy_linux_test.go b/fs/copy_linux_test.go index 0171f346..f2828603 100644 --- a/fs/copy_linux_test.go +++ b/fs/copy_linux_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux /* Copyright The containerd Authors. diff --git a/fs/copy_nondarwin.go b/fs/copy_nondarwin.go index 275b64c0..5f893d23 100644 --- a/fs/copy_nondarwin.go +++ b/fs/copy_nondarwin.go @@ -1,5 +1,4 @@ //go:build !darwin -// +build !darwin /* Copyright The containerd Authors. diff --git a/fs/copy_unix.go b/fs/copy_unix.go index 2e25914d..2115e65a 100644 --- a/fs/copy_unix.go +++ b/fs/copy_unix.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || openbsd || netbsd || dragonfly || solaris -// +build darwin freebsd openbsd netbsd dragonfly solaris /* Copyright The containerd Authors. diff --git a/fs/copy_unix_test.go b/fs/copy_unix_test.go index 69eb2d52..50b8eeff 100644 --- a/fs/copy_unix_test.go +++ b/fs/copy_unix_test.go @@ -1,5 +1,4 @@ //go:build linux || darwin -// +build linux darwin /* Copyright The containerd Authors. diff --git a/fs/diff_nonlinux.go b/fs/diff_nonlinux.go index abf9920b..4402ce96 100644 --- a/fs/diff_nonlinux.go +++ b/fs/diff_nonlinux.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux /* Copyright The containerd Authors. diff --git a/fs/diff_unix.go b/fs/diff_unix.go index d4897554..fe1b35dc 100644 --- a/fs/diff_unix.go +++ b/fs/diff_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/dtype_linux.go b/fs/dtype_linux.go index 9f55e798..f38a91d1 100644 --- a/fs/dtype_linux.go +++ b/fs/dtype_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux /* Copyright The containerd Authors. diff --git a/fs/dtype_linux_test.go b/fs/dtype_linux_test.go index 179e5ec0..69041f94 100644 --- a/fs/dtype_linux_test.go +++ b/fs/dtype_linux_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux /* Copyright The containerd Authors. diff --git a/fs/du_cmd_freebsddarwin_test.go b/fs/du_cmd_freebsddarwin_test.go index 5d99da8c..e41556c0 100644 --- a/fs/du_cmd_freebsddarwin_test.go +++ b/fs/du_cmd_freebsddarwin_test.go @@ -1,5 +1,4 @@ //go:build freebsd || dragonfly || darwin -// +build freebsd dragonfly darwin /* Copyright The containerd Authors. diff --git a/fs/du_cmd_unix_test.go b/fs/du_cmd_unix_test.go index fd6f1905..1ee0ebdb 100644 --- a/fs/du_cmd_unix_test.go +++ b/fs/du_cmd_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows && !freebsd && !darwin && !dragonfly -// +build !windows,!freebsd,!darwin,!dragonfly /* Copyright The containerd Authors. diff --git a/fs/du_unix.go b/fs/du_unix.go index 51a08a1d..fbd4a002 100644 --- a/fs/du_unix.go +++ b/fs/du_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/du_unix_test.go b/fs/du_unix_test.go index 1a2fbd0a..79867345 100644 --- a/fs/du_unix_test.go +++ b/fs/du_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/du_windows.go b/fs/du_windows.go index ea721f82..48494e2c 100644 --- a/fs/du_windows.go +++ b/fs/du_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows /* Copyright The containerd Authors. diff --git a/fs/fstest/compare_unix.go b/fs/fstest/compare_unix.go index 3cdb9963..50cf95d4 100644 --- a/fs/fstest/compare_unix.go +++ b/fs/fstest/compare_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/fstest/file_unix.go b/fs/fstest/file_unix.go index fe993ed8..a19e3e5f 100644 --- a/fs/fstest/file_unix.go +++ b/fs/fstest/file_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/hardlink_unix.go b/fs/hardlink_unix.go index cce8902f..e0e22f62 100644 --- a/fs/hardlink_unix.go +++ b/fs/hardlink_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/path_test.go b/fs/path_test.go index 57e2fa02..662aaf4a 100644 --- a/fs/path_test.go +++ b/fs/path_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/fs/stat_darwinbsd.go b/fs/stat_darwinbsd.go index dbdb90ec..7a34eda3 100644 --- a/fs/stat_darwinbsd.go +++ b/fs/stat_darwinbsd.go @@ -1,5 +1,4 @@ //go:build darwin || freebsd || netbsd -// +build darwin freebsd netbsd /* Copyright The containerd Authors. diff --git a/fs/stat_unix.go b/fs/stat_unix.go index a1106c8e..0edebdf1 100644 --- a/fs/stat_unix.go +++ b/fs/stat_unix.go @@ -1,5 +1,4 @@ //go:build linux || openbsd || dragonfly || solaris -// +build linux openbsd dragonfly solaris /* Copyright The containerd Authors. diff --git a/fs/utimesnanoat.go b/fs/utimesnanoat.go index 5435398d..cc66a535 100644 --- a/fs/utimesnanoat.go +++ b/fs/utimesnanoat.go @@ -1,5 +1,4 @@ //go:build !(windows || linux) -// +build !windows,!linux /* Copyright The containerd Authors. diff --git a/hardlinks_unix.go b/hardlinks_unix.go index a1fafb0a..c1d37538 100644 --- a/hardlinks_unix.go +++ b/hardlinks_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/manifest_test.go b/manifest_test.go index 3eef79e0..2a88d861 100644 --- a/manifest_test.go +++ b/manifest_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/manifest_test_darwin.go b/manifest_test_darwin.go index 15fbd5ab..755bfb97 100644 --- a/manifest_test_darwin.go +++ b/manifest_test_darwin.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore /* Copyright The containerd Authors. diff --git a/resource_unix.go b/resource_unix.go index eaf7c1da..fce2497f 100644 --- a/resource_unix.go +++ b/resource_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/sysx/nodata_unix.go b/sysx/nodata_unix.go index e78f77f6..b5720ac9 100644 --- a/sysx/nodata_unix.go +++ b/sysx/nodata_unix.go @@ -1,5 +1,4 @@ //go:build !(linux || solaris || windows) -// +build !linux,!solaris,!windows /* Copyright The containerd Authors. diff --git a/sysx/xattr.go b/sysx/xattr.go index 14973985..eb1bbd98 100644 --- a/sysx/xattr.go +++ b/sysx/xattr.go @@ -1,5 +1,4 @@ //go:build linux || darwin -// +build linux darwin /* Copyright The containerd Authors. diff --git a/sysx/xattr_unsupported.go b/sysx/xattr_unsupported.go index da1e940d..9e0963bf 100644 --- a/sysx/xattr_unsupported.go +++ b/sysx/xattr_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin /* Copyright The containerd Authors. diff --git a/testutil/helpers_unix.go b/testutil/helpers_unix.go index dac3657f..7d6c486b 100644 --- a/testutil/helpers_unix.go +++ b/testutil/helpers_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The containerd Authors. diff --git a/testutil/mount_other.go b/testutil/mount_other.go index 3ba487ac..34ddde67 100644 --- a/testutil/mount_other.go +++ b/testutil/mount_other.go @@ -1,5 +1,4 @@ //go:build !linux && !windows -// +build !linux,!windows /* Copyright The containerd Authors.