From a0f0578299905a607cf591cdb3d8608def655cfd Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 26 Mar 2022 18:34:10 +0100 Subject: [PATCH] gofmt with go1.17 Signed-off-by: Sebastiaan van Stijn --- cli-plugins/manager/manager_unix.go | 1 + cli-plugins/manager/suffix_unix.go | 1 + cli/command/container/signals_unix.go | 1 + cli/command/container/signals_unix_test.go | 1 + cli/command/image/build/context_unix.go | 1 + cli/command/image/build/context_windows.go | 2 -- cli/config/configfile/file_unix.go | 1 + cli/config/credentials/default_store_unsupported.go | 1 + cli/connhelper/commandconn/commandconn_unix_test.go | 1 + cli/connhelper/commandconn/pdeathsig_nolinux.go | 1 + cli/connhelper/commandconn/session_unix.go | 1 + docs/generate.go | 1 + docs/tools.go | 1 + man/generate.go | 1 + man/tools.go | 1 + opts/hosts_unix.go | 1 + opts/hosts_windows.go | 2 -- 17 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go index f586acbd8..6aa5b9e5c 100644 --- a/cli-plugins/manager/manager_unix.go +++ b/cli-plugins/manager/manager_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package manager diff --git a/cli-plugins/manager/suffix_unix.go b/cli-plugins/manager/suffix_unix.go index 14f0903f4..afaf0007f 100644 --- a/cli-plugins/manager/suffix_unix.go +++ b/cli-plugins/manager/suffix_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package manager diff --git a/cli/command/container/signals_unix.go b/cli/command/container/signals_unix.go index 8db4cfe83..757abbf16 100644 --- a/cli/command/container/signals_unix.go +++ b/cli/command/container/signals_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package container diff --git a/cli/command/container/signals_unix_test.go b/cli/command/container/signals_unix_test.go index 61ffe64a1..84f7f52be 100644 --- a/cli/command/container/signals_unix_test.go +++ b/cli/command/container/signals_unix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package container diff --git a/cli/command/image/build/context_unix.go b/cli/command/image/build/context_unix.go index cb2634f07..5bf97c09f 100644 --- a/cli/command/image/build/context_unix.go +++ b/cli/command/image/build/context_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package build diff --git a/cli/command/image/build/context_windows.go b/cli/command/image/build/context_windows.go index c577cfa7b..f127e5a14 100644 --- a/cli/command/image/build/context_windows.go +++ b/cli/command/image/build/context_windows.go @@ -1,5 +1,3 @@ -// +build windows - package build import ( diff --git a/cli/config/configfile/file_unix.go b/cli/config/configfile/file_unix.go index 3ca65c614..6af671812 100644 --- a/cli/config/configfile/file_unix.go +++ b/cli/config/configfile/file_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package configfile diff --git a/cli/config/credentials/default_store_unsupported.go b/cli/config/credentials/default_store_unsupported.go index 3028168ac..c9630ea51 100644 --- a/cli/config/credentials/default_store_unsupported.go +++ b/cli/config/credentials/default_store_unsupported.go @@ -1,3 +1,4 @@ +//go:build !windows && !darwin && !linux // +build !windows,!darwin,!linux package credentials diff --git a/cli/connhelper/commandconn/commandconn_unix_test.go b/cli/connhelper/commandconn/commandconn_unix_test.go index 18231b8f2..0103bcea2 100644 --- a/cli/connhelper/commandconn/commandconn_unix_test.go +++ b/cli/connhelper/commandconn/commandconn_unix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package commandconn diff --git a/cli/connhelper/commandconn/pdeathsig_nolinux.go b/cli/connhelper/commandconn/pdeathsig_nolinux.go index ab0716672..2adcf0816 100644 --- a/cli/connhelper/commandconn/pdeathsig_nolinux.go +++ b/cli/connhelper/commandconn/pdeathsig_nolinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package commandconn diff --git a/cli/connhelper/commandconn/session_unix.go b/cli/connhelper/commandconn/session_unix.go index 6448500d6..57bdecec0 100644 --- a/cli/connhelper/commandconn/session_unix.go +++ b/cli/connhelper/commandconn/session_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package commandconn diff --git a/docs/generate.go b/docs/generate.go index a95dd42a8..62e1b829a 100644 --- a/docs/generate.go +++ b/docs/generate.go @@ -1,5 +1,6 @@ // This file is intended for use with "go run"; it isn't really part of the package. +//go:build docsgen // +build docsgen package main diff --git a/docs/tools.go b/docs/tools.go index 23f0eaff7..47510bc49 100644 --- a/docs/tools.go +++ b/docs/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools package main diff --git a/man/generate.go b/man/generate.go index 4a75dcf08..6a0d065db 100644 --- a/man/generate.go +++ b/man/generate.go @@ -1,5 +1,6 @@ // This file is intended for use with "go run"; it isn't really part of the package. +//go:build manpages // +build manpages package main diff --git a/man/tools.go b/man/tools.go index eca2bd01f..3cafe6533 100644 --- a/man/tools.go +++ b/man/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools package main diff --git a/opts/hosts_unix.go b/opts/hosts_unix.go index 344b6c2e1..206834d4d 100644 --- a/opts/hosts_unix.go +++ b/opts/hosts_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package opts diff --git a/opts/hosts_windows.go b/opts/hosts_windows.go index 97c6d857c..1e42a2d77 100644 --- a/opts/hosts_windows.go +++ b/opts/hosts_windows.go @@ -1,5 +1,3 @@ -// +build windows - package opts // defaultHost constant defines the default host string used by docker on Windows