Merge pull request #1967 from alexandear/pkg-go-fix-buildtag

AkihiroSuda · web-flow · commit 21976a90807a · 2023-10-31T01:29:00.000+09:00
pkg: remove outdated or unnecessary build tags
diff --git a/pkg/guestagent/api/client/client_others.go b/pkg/guestagent/api/client/client_others.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package client
 
diff --git a/pkg/guestagent/api/client/client_windows.go b/pkg/guestagent/api/client/client_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package client
 
 import (
diff --git a/pkg/hostagent/port_others.go b/pkg/hostagent/port_others.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package hostagent
 
diff --git a/pkg/hostagent/port_windows.go b/pkg/hostagent/port_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package hostagent
 
 import (
diff --git a/pkg/httpclientutil/httpclientutil_others.go b/pkg/httpclientutil/httpclientutil_others.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package httpclientutil
 
diff --git a/pkg/httpclientutil/httpclientutil_windows.go b/pkg/httpclientutil/httpclientutil_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package httpclientutil
 
 import (
diff --git a/pkg/lockutil/lockutil_unix.go b/pkg/lockutil/lockutil_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // From https://github.com/containerd/nerdctl/blob/v0.13.0/pkg/lockutil/lockutil_unix.go
 /*
diff --git a/pkg/osutil/dns_others.go b/pkg/osutil/dns_others.go
@@ -1,5 +1,4 @@
 //go:build !darwin
-// +build !darwin
 
 package osutil
 
diff --git a/pkg/osutil/osutil_others.go b/pkg/osutil/osutil_others.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package osutil
 
diff --git a/pkg/osutil/rosetta_others.go b/pkg/osutil/rosetta_others.go
@@ -1,5 +1,4 @@
 //go:build !darwin
-// +build !darwin
 
 package osutil
 
diff --git a/pkg/start/ha_cmd_opts_others.go b/pkg/start/ha_cmd_opts_others.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package start
 
diff --git a/pkg/store/instance_unix.go b/pkg/store/instance_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package store
 
diff --git a/pkg/vz/errors_darwin.go b/pkg/vz/errors_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && !no_vz
-// +build darwin,!no_vz
 
 package vz
 
diff --git a/pkg/vz/network_darwin.go b/pkg/vz/network_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && !no_vz
-// +build darwin,!no_vz
 
 package vz
 
diff --git a/pkg/vz/rosetta_directory_share.go b/pkg/vz/rosetta_directory_share.go
@@ -1,5 +1,4 @@
 //go:build darwin && !arm64 && !no_vz
-// +build darwin,!arm64,!no_vz
 
 package vz
 
diff --git a/pkg/vz/rosetta_directory_share_arm64.go b/pkg/vz/rosetta_directory_share_arm64.go
@@ -1,5 +1,4 @@
 //go:build darwin && arm64 && !no_vz
-// +build darwin,arm64,!no_vz
 
 package vz
 
diff --git a/pkg/vz/vm_darwin.go b/pkg/vz/vm_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && !no_vz
-// +build darwin,!no_vz
 
 package vz
 
diff --git a/pkg/vz/vz_driver_darwin.go b/pkg/vz/vz_driver_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && !no_vz
-// +build darwin,!no_vz
 
 package vz
 
diff --git a/pkg/vz/vz_driver_others.go b/pkg/vz/vz_driver_others.go
@@ -1,5 +1,4 @@
 //go:build !darwin || no_vz
-// +build !darwin no_vz
 
 package vz
 
diff --git a/pkg/windows/process_windows.go b/pkg/windows/process_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package windows
 
 import (
diff --git a/pkg/windows/registry_windows.go b/pkg/windows/registry_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package windows
 
 import (
diff --git a/pkg/windows/wsl_util_windows.go b/pkg/windows/wsl_util_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package windows
 
 import (
diff --git a/pkg/wsl2/vm_windows.go b/pkg/wsl2/vm_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package wsl2
 
 import (
diff --git a/pkg/wsl2/wsl_driver_others.go b/pkg/wsl2/wsl_driver_others.go
@@ -1,5 +1,4 @@
 //go:build !windows || no_wsl
-// +build !windows no_wsl
 
 package wsl2
 
diff --git a/pkg/wsl2/wsl_driver_windows.go b/pkg/wsl2/wsl_driver_windows.go
@@ -1,6 +1,3 @@
-//go:build windows
-// +build windows
-
 package wsl2
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !windows`
`2`		`-// +build !windows`
`3`	`2`
`4`	`3`	`package client`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !darwin && !windows`
`2`		`-// +build !darwin,!windows`
`3`	`2`
`4`	`3`	`package hostagent`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !darwin`
`2`		`-// +build !darwin`
`3`	`2`
`4`	`3`	`package osutil`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux && !windows`
`2`		`-// +build !linux,!windows`
`3`	`2`
`4`	`3`	`package osutil`
`5`	`4`