diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-18 11:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 11:24:58 +0100 |
| commit | f8b04bf56c44411e39e355446c4a311dc9fcb373 (patch) | |
| tree | 50bbd35bb2b90c206e82c74771dbef43593c0d9d /pkg/util | |
| parent | d72a829f59992dfe29cb84125fde3cce631e6436 (diff) | |
| parent | ea08765f400d828907f231baa84bd880a00d95f1 (diff) | |
| download | podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.tar.gz podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.tar.bz2 podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.zip | |
Merge pull request #13552 from vrothberg/go1.18
go fmt: use go 1.18 conditional-build syntax
Diffstat (limited to 'pkg/util')
| -rw-r--r-- | pkg/util/mountOpts_other.go | 1 | ||||
| -rw-r--r-- | pkg/util/utils_darwin.go | 3 | ||||
| -rw-r--r-- | pkg/util/utils_supported.go | 1 | ||||
| -rw-r--r-- | pkg/util/utils_unsupported.go | 1 | ||||
| -rw-r--r-- | pkg/util/utils_windows.go | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/pkg/util/mountOpts_other.go b/pkg/util/mountOpts_other.go index 6a34942e5..64b4dd1d9 100644 --- a/pkg/util/mountOpts_other.go +++ b/pkg/util/mountOpts_other.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package util diff --git a/pkg/util/utils_darwin.go b/pkg/util/utils_darwin.go index 33a46a5d4..66ae85e9c 100644 --- a/pkg/util/utils_darwin.go +++ b/pkg/util/utils_darwin.go @@ -1,4 +1,5 @@ -//+build darwin +//go:build darwin +// +build darwin package util diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 848b35a45..50e4b1b7b 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package util diff --git a/pkg/util/utils_unsupported.go b/pkg/util/utils_unsupported.go index 62805d7c8..896346493 100644 --- a/pkg/util/utils_unsupported.go +++ b/pkg/util/utils_unsupported.go @@ -1,3 +1,4 @@ +//go:build darwin || windows // +build darwin windows package util diff --git a/pkg/util/utils_windows.go b/pkg/util/utils_windows.go index 46ca5e7f1..2732124f2 100644 --- a/pkg/util/utils_windows.go +++ b/pkg/util/utils_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package util |