Rationalise build constraints for Go 1.19 onwards

This mostly involves replacing anything that was trying to be "Not Windows" with the new-in-Go-1.19 "unix" build-constraint. Effectively, anything that contained both "linux" and "freebsd" but not "windows", or excluded only "windows", is now "unix". A couple of needless constraints were removed when the filenames already carried the appropriate constraint. A handful of files were renamed, so that now "unix"-suffixed files all use the "unix" constraint, and "other" is used when the constraint is more-complex, for "no specific implementation" cases. Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
containerd · Apr 8, 2024 · b5117a2 · b5117a2
1 parent 5fac99b
commit b5117a2
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 28 deletions.
diff --git a/cmd/nerdctl/container_top_unix_test.go b/cmd/nerdctl/container_top_unix_test.go
@@ -1,4 +1,4 @@
-//go:build linux || darwin || freebsd || netbsd || openbsd
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/nerdctl/main_unix.go b/cmd/nerdctl/main_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/nerdctl/network_create_unix.go b/cmd/nerdctl/network_create_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/buildkitutil/buildkitutil_unix.go b/pkg/buildkitutil/buildkitutil_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/cioutil/container_io_unix.go b/pkg/cioutil/container_io_unix.go
@@ -1,4 +1,4 @@
-//go:build !windows
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/cioutil/container_io_windows.go b/pkg/cioutil/container_io_windows.go
@@ -1,5 +1,3 @@
-//go:build windows
-
 /*
    Copyright The containerd Authors.
 

diff --git a/pkg/cmd/container/top_unix.go b/pkg/cmd/container/top_unix.go
@@ -1,4 +1,4 @@
-//go:build linux || darwin || freebsd || netbsd || openbsd
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/cmd/login/login_unix.go b/pkg/cmd/login/login_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/consoleutil/consoleutil_unix.go b/pkg/consoleutil/consoleutil_unix.go
@@ -1,4 +1,4 @@
-//go:build !windows
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/containerutil/container_network_manager_other.go b/pkg/containerutil/container_network_manager_other.go
@@ -1,4 +1,4 @@
-//go:build darwin || freebsd || netbsd || openbsd
+//go:build !(linux || windows)
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/infoutil/infoutil_unix.go b/pkg/infoutil/infoutil_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/infoutil/infoutil_unix_test.go b/pkg/infoutil/infoutil_unix_test.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/ipcutil/ipcutil_linux.go b/pkg/ipcutil/ipcutil_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 /*
    Copyright The containerd Authors.
 

diff --git a/pkg/ipcutil/ipcutil_unix.go → pkg/ipcutil/ipcutil_other.go b/pkg/ipcutil/ipcutil_unix.go → pkg/ipcutil/ipcutil_other.go
@@ -1,4 +1,4 @@
-//go:build freebsd
+//go:build !(linux || windows)
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/lockutil/lockutil_unix.go b/pkg/lockutil/lockutil_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/mountutil/mountutil_other.go → pkg/mountutil/mountutil_unix.go b/pkg/mountutil/mountutil_other.go → pkg/mountutil/mountutil_unix.go
@@ -1,4 +1,4 @@
-//go:build !windows
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/mountutil/mountutil_windows.go b/pkg/mountutil/mountutil_windows.go
@@ -1,5 +1,3 @@
-//go:build windows
-
 /*
    Copyright The containerd Authors.
 

diff --git a/pkg/netutil/cni_plugin_unix.go b/pkg/netutil/cni_plugin_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/netutil/netutil_linux_test.go b/pkg/netutil/netutil_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 /*
    Copyright The containerd Authors.
 

diff --git a/pkg/netutil/netutil_unix.go b/pkg/netutil/netutil_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/netutil/netutil_unix_test.go b/pkg/netutil/netutil_unix_test.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/netutil/netutil_windows_test.go b/pkg/netutil/netutil_windows_test.go
@@ -1,5 +1,3 @@
-//go:build windows
-
 /*
    Copyright The containerd Authors.
 

diff --git a/pkg/portutil/port_allocate_others.go → pkg/portutil/port_allocate_other.go b/pkg/portutil/port_allocate_others.go → pkg/portutil/port_allocate_other.go
diff --git a/pkg/signalutil/signals_notlinux.go → pkg/signalutil/signals_other.go b/pkg/signalutil/signals_notlinux.go → pkg/signalutil/signals_other.go
diff --git a/pkg/systemutil/socket_unix.go b/pkg/systemutil/socket_unix.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux
+//go:build unix
 
 /*
    Copyright The containerd Authors.