From 1bd86a8f79434386088ecbc4492261ab39618b9e Mon Sep 17 00:00:00 2001 From: Dmytro Maluka Date: Mon, 24 Mar 2025 22:54:32 +0100 Subject: [PATCH] Build constraints: switch to new syntax Make gofmt happy about that. --- internal/action/actions_other.go | 2 +- internal/action/actions_posix.go | 2 +- internal/action/terminal_supported.go | 2 +- internal/action/terminal_unsupported.go | 2 +- runtime/syntax/syntax_converter.go | 2 +- tools/build-date.go | 2 +- tools/build-version.go | 2 +- tools/info-plist.go | 1 - tools/remove-nightly-assets.go | 2 +- tools/testgen.go | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/action/actions_other.go b/internal/action/actions_other.go index 6d62581b..f459e3b3 100644 --- a/internal/action/actions_other.go +++ b/internal/action/actions_other.go @@ -1,4 +1,4 @@ -// +build plan9 nacl windows +//go:build plan9 || nacl || windows package action diff --git a/internal/action/actions_posix.go b/internal/action/actions_posix.go index 15bc0aa1..59f04ede 100644 --- a/internal/action/actions_posix.go +++ b/internal/action/actions_posix.go @@ -1,4 +1,4 @@ -// +build linux darwin dragonfly solaris openbsd netbsd freebsd +//go:build linux || darwin || dragonfly || solaris || openbsd || netbsd || freebsd package action diff --git a/internal/action/terminal_supported.go b/internal/action/terminal_supported.go index 4255536c..403e94c2 100644 --- a/internal/action/terminal_supported.go +++ b/internal/action/terminal_supported.go @@ -1,4 +1,4 @@ -// +build linux darwin dragonfly openbsd_amd64 freebsd +//go:build linux || darwin || dragonfly || openbsd_amd64 || freebsd package action diff --git a/internal/action/terminal_unsupported.go b/internal/action/terminal_unsupported.go index d279550e..1a03428f 100644 --- a/internal/action/terminal_unsupported.go +++ b/internal/action/terminal_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux,!darwin,!freebsd,!dragonfly,!openbsd_amd64 +//go:build !linux && !darwin && !freebsd && !dragonfly && !openbsd_amd64 package action diff --git a/runtime/syntax/syntax_converter.go b/runtime/syntax/syntax_converter.go index 1bf9ca31..f96d4af7 100644 --- a/runtime/syntax/syntax_converter.go +++ b/runtime/syntax/syntax_converter.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore package main diff --git a/tools/build-date.go b/tools/build-date.go index 48174c1b..74f2fbe8 100644 --- a/tools/build-date.go +++ b/tools/build-date.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore package main diff --git a/tools/build-version.go b/tools/build-version.go index e9d0cdda..c541fd93 100644 --- a/tools/build-version.go +++ b/tools/build-version.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore package main diff --git a/tools/info-plist.go b/tools/info-plist.go index 33e55291..f6c990d4 100644 --- a/tools/info-plist.go +++ b/tools/info-plist.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/tools/remove-nightly-assets.go b/tools/remove-nightly-assets.go index 0e0411f7..3687eb15 100644 --- a/tools/remove-nightly-assets.go +++ b/tools/remove-nightly-assets.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore package main diff --git a/tools/testgen.go b/tools/testgen.go index 580b5a65..6185e8a4 100644 --- a/tools/testgen.go +++ b/tools/testgen.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore package main