From deaf0631928e1430d636d54ce51be689d2a076f3 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 2 Dec 2022 14:32:54 -0600 Subject: [PATCH] main: Remove old style build constraints. This removes the old style build constraints that were required for versions of Go prior to version 1.17 now that only Go 1.18 and Go 1.19 are actively supported. Note that it intentionally does not remove them from the modules to avoid needlessly breaking any consumers that might still be using them form older versions of Go. --- internal/integration/rpctests/rpcserver_test.go | 1 - internal/integration/rpctests/treasury_test.go | 1 - internal/limits/limits_unix.go | 1 - internal/limits/memlimit.go | 1 - internal/limits/memlimit_old.go | 1 - internal/version/version_buildinfo.go | 1 - internal/version/version_nobuildinfo.go | 1 - signal_syscall.go | 1 - 8 files changed, 8 deletions(-) diff --git a/internal/integration/rpctests/rpcserver_test.go b/internal/integration/rpctests/rpcserver_test.go index 6338e708bc..87b65a23d8 100644 --- a/internal/integration/rpctests/rpcserver_test.go +++ b/internal/integration/rpctests/rpcserver_test.go @@ -6,7 +6,6 @@ // This file is ignored during the regular tests due to the following build tag. //go:build rpctest -// +build rpctest package rpctests diff --git a/internal/integration/rpctests/treasury_test.go b/internal/integration/rpctests/treasury_test.go index 85170d89c8..f3e59c7257 100644 --- a/internal/integration/rpctests/treasury_test.go +++ b/internal/integration/rpctests/treasury_test.go @@ -5,7 +5,6 @@ // This file is ignored during the regular tests due to the following build tag. //go:build rpctest -// +build rpctest package rpctests diff --git a/internal/limits/limits_unix.go b/internal/limits/limits_unix.go index 4e5f4811c5..8342b68eb1 100644 --- a/internal/limits/limits_unix.go +++ b/internal/limits/limits_unix.go @@ -4,7 +4,6 @@ // license that can be found in the LICENSE file. //go:build !windows && !plan9 -// +build !windows,!plan9 package limits diff --git a/internal/limits/memlimit.go b/internal/limits/memlimit.go index 2c8976d725..1920fb38e7 100644 --- a/internal/limits/memlimit.go +++ b/internal/limits/memlimit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.19 -// +build go1.19 package limits diff --git a/internal/limits/memlimit_old.go b/internal/limits/memlimit_old.go index e0f5cf49cf..a9a7bc7aad 100644 --- a/internal/limits/memlimit_old.go +++ b/internal/limits/memlimit_old.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !go1.19 -// +build !go1.19 package limits diff --git a/internal/version/version_buildinfo.go b/internal/version/version_buildinfo.go index b911f32560..06a70370c6 100644 --- a/internal/version/version_buildinfo.go +++ b/internal/version/version_buildinfo.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package version diff --git a/internal/version/version_nobuildinfo.go b/internal/version/version_nobuildinfo.go index bcae7960ac..3355972ad2 100644 --- a/internal/version/version_nobuildinfo.go +++ b/internal/version/version_nobuildinfo.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !go1.18 -// +build !go1.18 package version diff --git a/signal_syscall.go b/signal_syscall.go index 4a4d956573..d581c18cab 100644 --- a/signal_syscall.go +++ b/signal_syscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. // //go:build windows || aix || android || darwin || dragonfly || freebsd || hurd || illumos || ios || linux || netbsd || openbsd || solaris -// +build windows aix android darwin dragonfly freebsd hurd illumos ios linux netbsd openbsd solaris package main