From 2878cc8079e6591f5f0a2a7eb5dbac2839effb4e Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Thu, 14 Apr 2022 07:56:31 -0700 Subject: [PATCH] replace +build with go:build go:build is the new conditional compilation directive used to specify build constraints. It was introduced in Go 1.17. It is meant to replace the old +build directives. Now that go.mod points to Go 1.17 we no longer need to support both build flags. Signed-off-by: Matthew Fisher --- cmd/helm/root_unix.go | 1 - cmd/helm/root_unix_test.go | 1 - internal/third_party/dep/fs/rename.go | 2 +- internal/third_party/dep/fs/rename_windows.go | 2 +- pkg/helmpath/home_unix_test.go | 1 - pkg/helmpath/home_windows_test.go | 2 +- pkg/helmpath/lazypath_darwin.go | 1 - pkg/helmpath/lazypath_darwin_test.go | 1 - pkg/helmpath/lazypath_unix.go | 1 - pkg/helmpath/lazypath_unix_test.go | 1 - pkg/helmpath/lazypath_windows.go | 2 +- pkg/helmpath/lazypath_windows_test.go | 2 +- 12 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cmd/helm/root_unix.go b/cmd/helm/root_unix.go index 47be08b957f..92fa1b59d05 100644 --- a/cmd/helm/root_unix.go +++ b/cmd/helm/root_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The Helm Authors. diff --git a/cmd/helm/root_unix_test.go b/cmd/helm/root_unix_test.go index c253fb81e40..f7466a93d70 100644 --- a/cmd/helm/root_unix_test.go +++ b/cmd/helm/root_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows /* Copyright The Helm Authors. diff --git a/internal/third_party/dep/fs/rename.go b/internal/third_party/dep/fs/rename.go index 0bb600949e6..a3e5e56a61a 100644 --- a/internal/third_party/dep/fs/rename.go +++ b/internal/third_party/dep/fs/rename.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows /* Copyright (c) for portions of rename.go are held by The Go Authors, 2016 and are provided under diff --git a/internal/third_party/dep/fs/rename_windows.go b/internal/third_party/dep/fs/rename_windows.go index 14f017d0956..a377720a6f5 100644 --- a/internal/third_party/dep/fs/rename_windows.go +++ b/internal/third_party/dep/fs/rename_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows /* Copyright (c) for portions of rename_windows.go are held by The Go Authors, 2016 and are provided under diff --git a/pkg/helmpath/home_unix_test.go b/pkg/helmpath/home_unix_test.go index b2a6b7a1416..977002549ca 100644 --- a/pkg/helmpath/home_unix_test.go +++ b/pkg/helmpath/home_unix_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !windows -// +build !windows package helmpath diff --git a/pkg/helmpath/home_windows_test.go b/pkg/helmpath/home_windows_test.go index 796ced62c35..073e6347f5c 100644 --- a/pkg/helmpath/home_windows_test.go +++ b/pkg/helmpath/home_windows_test.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build windows +//go:build windows package helmpath diff --git a/pkg/helmpath/lazypath_darwin.go b/pkg/helmpath/lazypath_darwin.go index 80477abab79..eba6dde151d 100644 --- a/pkg/helmpath/lazypath_darwin.go +++ b/pkg/helmpath/lazypath_darwin.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build darwin -// +build darwin package helmpath diff --git a/pkg/helmpath/lazypath_darwin_test.go b/pkg/helmpath/lazypath_darwin_test.go index 8c1c91e423c..d0503e0e104 100644 --- a/pkg/helmpath/lazypath_darwin_test.go +++ b/pkg/helmpath/lazypath_darwin_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build darwin -// +build darwin package helmpath diff --git a/pkg/helmpath/lazypath_unix.go b/pkg/helmpath/lazypath_unix.go index a5afc123712..82fb4b6f1fe 100644 --- a/pkg/helmpath/lazypath_unix.go +++ b/pkg/helmpath/lazypath_unix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !windows && !darwin -// +build !windows,!darwin package helmpath diff --git a/pkg/helmpath/lazypath_unix_test.go b/pkg/helmpath/lazypath_unix_test.go index 450e957814c..657982b2d93 100644 --- a/pkg/helmpath/lazypath_unix_test.go +++ b/pkg/helmpath/lazypath_unix_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !windows && !darwin -// +build !windows,!darwin package helmpath diff --git a/pkg/helmpath/lazypath_windows.go b/pkg/helmpath/lazypath_windows.go index 057a3af1408..230aee2a933 100644 --- a/pkg/helmpath/lazypath_windows.go +++ b/pkg/helmpath/lazypath_windows.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build windows +//go:build windows package helmpath diff --git a/pkg/helmpath/lazypath_windows_test.go b/pkg/helmpath/lazypath_windows_test.go index 866e7b9d97f..dedfd57205b 100644 --- a/pkg/helmpath/lazypath_windows_test.go +++ b/pkg/helmpath/lazypath_windows_test.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build windows +//go:build windows package helmpath