Update formatting for Go 1.17

From the 1.17 release notes (https://golang.org/doc/go1.17#gofmt): gofmt (and go fmt) now synchronizes //go:build lines with // +build lines. More info about this change can be found at https://golang.org/design/draft-gobuild
manoraj · Aug 17, 2021 · d7a3a09 · d7a3a09
1 parent a7d2de6
commit d7a3a09
Show file tree

Hide file tree

Showing 39 changed files with 42 additions and 4 deletions.
diff --git a/commands/path_nix.go b/commands/path_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package commands

diff --git a/commands/path_windows.go b/commands/path_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package commands

diff --git a/config/netrc_nix.go b/config/netrc_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config

diff --git a/config/netrc_windows.go b/config/netrc_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config

diff --git a/config/util_nix.go b/config/util_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config

diff --git a/config/util_windows.go b/config/util_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config

diff --git a/creds/creds_nix.go b/creds/creds_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package creds

diff --git a/creds/creds_windows.go b/creds/creds_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package creds

diff --git a/git-lfs_windows.go b/git-lfs_windows.go
@@ -1,4 +1,6 @@
-//+build windows
+//go:build windows
+// +build windows
+
 //go:generate goversioninfo
 
 package main
diff --git a/lfs/util_generic.go b/lfs/util_generic.go
@@ -1,3 +1,4 @@
+//go:build !linux || !cgo
 // +build !linux !cgo
 
 package lfs

diff --git a/lfshttp/certs_nix.go b/lfshttp/certs_nix.go
@@ -1,3 +1,4 @@
+//go:build !darwin && !windows
 // +build !darwin,!windows
 
 package lfshttp

diff --git a/subprocess/path_nix.go b/subprocess/path_nix.go
@@ -26,6 +26,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+//go:build !windows
 // +build !windows
 
 package subprocess

diff --git a/subprocess/path_windows.go b/subprocess/path_windows.go
@@ -26,6 +26,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+//go:build windows
 // +build windows
 
 package subprocess

diff --git a/subprocess/subprocess_nix.go b/subprocess/subprocess_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package subprocess

diff --git a/subprocess/subprocess_windows.go b/subprocess/subprocess_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package subprocess

diff --git a/t/cmd/git-credential-lfsnoop.go b/t/cmd/git-credential-lfsnoop.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/git-credential-lfstest.go b/t/cmd/git-credential-lfstest.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfs-askpass.go b/t/cmd/lfs-askpass.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfs-ssh-echo.go b/t/cmd/lfs-ssh-echo.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfs-ssh-proxy-test.go b/t/cmd/lfs-ssh-proxy-test.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfstest-customadapter.go b/t/cmd/lfstest-customadapter.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfstest-gitserver.go b/t/cmd/lfstest-gitserver.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfstest-realpath.go b/t/cmd/lfstest-realpath.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfstest-standalonecustomadapter.go b/t/cmd/lfstest-standalonecustomadapter.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/t/cmd/lfstest-testutils.go b/t/cmd/lfstest-testutils.go
@@ -1,3 +1,4 @@
+//go:build testtools
 // +build testtools
 
 package main

diff --git a/tools/cygwin.go b/tools/cygwin.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package tools

diff --git a/tools/cygwin_windows.go b/tools/cygwin_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tools

diff --git a/tools/filetools_nix.go b/tools/filetools_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package tools

diff --git a/tools/filetools_windows.go b/tools/filetools_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tools

diff --git a/tools/robustio.go b/tools/robustio.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package tools

diff --git a/tools/robustio_windows.go b/tools/robustio_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tools

diff --git a/tools/umask_nix.go b/tools/umask_nix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package tools

diff --git a/tools/umask_windows.go b/tools/umask_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tools

diff --git a/tools/util_darwin.go b/tools/util_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package tools

diff --git a/tools/util_darwin_test.go b/tools/util_darwin_test.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package tools

diff --git a/tools/util_generic.go b/tools/util_generic.go
@@ -1,6 +1,5 @@
-// +build !linux
-// +build !darwin
-// +build !windows
+//go:build !linux && !darwin && !windows
+// +build !linux,!darwin,!windows
 
 package tools
 

diff --git a/tools/util_linux.go b/tools/util_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tools

diff --git a/tools/util_windows.go b/tools/util_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tools

diff --git a/tools/util_windows_test.go b/tools/util_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package tools