From cfe9478196eef8736a3c0bb2eccda826263420ea Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 26 Apr 2024 12:19:46 +0200 Subject: all: go fix everything --- pkg/build/linux_nolinux.go | 1 - pkg/build/linux_test.go | 1 - pkg/cover/report_test.go | 1 - pkg/csource/gen.go | 1 - pkg/gce/gce.go | 2 +- pkg/host/host_fuchsia.go | 1 - pkg/host/syscalls_linux_test.go | 1 - pkg/ifuzz/powerpc/generated/insns.go | 1 - pkg/ifuzz/x86/generated/insns.go | 1 - pkg/ifuzz/x86/xed.go | 1 - pkg/image/compression_nonoptimized.go | 1 - pkg/image/compression_optimized.go | 1 - pkg/kd/kd_test.go | 1 - pkg/osutil/osutil_bsd.go | 1 - pkg/osutil/osutil_fuchsia.go | 1 - pkg/osutil/osutil_unix.go | 1 - pkg/osutil/sharedmem_file.go | 1 - pkg/osutil/sharedmem_memfd.go | 1 - pkg/testutil/norace.go | 1 - pkg/testutil/race.go | 1 - pkg/tools/tools.go | 1 - 21 files changed, 1 insertion(+), 21 deletions(-) (limited to 'pkg') diff --git a/pkg/build/linux_nolinux.go b/pkg/build/linux_nolinux.go index 03ea0da27..6e9c4fd5e 100644 --- a/pkg/build/linux_nolinux.go +++ b/pkg/build/linux_nolinux.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build !linux -// +build !linux package build diff --git a/pkg/build/linux_test.go b/pkg/build/linux_test.go index 91d344531..8f4e2d73c 100644 --- a/pkg/build/linux_test.go +++ b/pkg/build/linux_test.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build linux -// +build linux package build diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go index d1ef7ac70..e93d43eda 100644 --- a/pkg/cover/report_test.go +++ b/pkg/cover/report_test.go @@ -4,7 +4,6 @@ // It may or may not work on other OSes. // If you test on another OS and it works, enable it. //go:build linux -// +build linux package cover diff --git a/pkg/csource/gen.go b/pkg/csource/gen.go index 2a491ccd6..7faf1ddaa 100644 --- a/pkg/csource/gen.go +++ b/pkg/csource/gen.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/pkg/gce/gce.go b/pkg/gce/gce.go index 0072bd21f..9bbdaa7b3 100644 --- a/pkg/gce/gce.go +++ b/pkg/gce/gce.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "golang.org/x/net/context" + "context" "golang.org/x/oauth2" "golang.org/x/oauth2/google" "google.golang.org/api/compute/v1" diff --git a/pkg/host/host_fuchsia.go b/pkg/host/host_fuchsia.go index bbfb41d1d..49f1b6406 100644 --- a/pkg/host/host_fuchsia.go +++ b/pkg/host/host_fuchsia.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build fuchsia -// +build fuchsia package host diff --git a/pkg/host/syscalls_linux_test.go b/pkg/host/syscalls_linux_test.go index 375a640ea..fc5d13dd5 100644 --- a/pkg/host/syscalls_linux_test.go +++ b/pkg/host/syscalls_linux_test.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build linux -// +build linux package host diff --git a/pkg/ifuzz/powerpc/generated/insns.go b/pkg/ifuzz/powerpc/generated/insns.go index 2dcdc88cf..898ccd163 100644 --- a/pkg/ifuzz/powerpc/generated/insns.go +++ b/pkg/ifuzz/powerpc/generated/insns.go @@ -1,7 +1,6 @@ // Code generated by ./pkg/ifuzz/powerpc/gen/powerisa31_tex_to_syz. DO NOT EDIT. //go:build !codeanalysis -// +build !codeanalysis package generated diff --git a/pkg/ifuzz/x86/generated/insns.go b/pkg/ifuzz/x86/generated/insns.go index 3a7153a09..3e990da92 100644 --- a/pkg/ifuzz/x86/generated/insns.go +++ b/pkg/ifuzz/x86/generated/insns.go @@ -1,7 +1,6 @@ // Code generated by pkg/ifuzz/gen. DO NOT EDIT. //go:build !codeanalysis -// +build !codeanalysis package generated diff --git a/pkg/ifuzz/x86/xed.go b/pkg/ifuzz/x86/xed.go index 6adf45314..0eebcb096 100644 --- a/pkg/ifuzz/x86/xed.go +++ b/pkg/ifuzz/x86/xed.go @@ -8,7 +8,6 @@ // go test -v -tags xed //go:build xed -// +build xed package x86 diff --git a/pkg/image/compression_nonoptimized.go b/pkg/image/compression_nonoptimized.go index 83e17c167..333b46815 100644 --- a/pkg/image/compression_nonoptimized.go +++ b/pkg/image/compression_nonoptimized.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build windows || 386 || arm -// +build windows 386 arm package image diff --git a/pkg/image/compression_optimized.go b/pkg/image/compression_optimized.go index ac043c3e7..ea6be9569 100644 --- a/pkg/image/compression_optimized.go +++ b/pkg/image/compression_optimized.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build !windows && !386 && !arm -// +build !windows,!386,!arm package image diff --git a/pkg/kd/kd_test.go b/pkg/kd/kd_test.go index 5c55ffd29..e250db420 100644 --- a/pkg/kd/kd_test.go +++ b/pkg/kd/kd_test.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build !s390x -// +build !s390x package kd diff --git a/pkg/osutil/osutil_bsd.go b/pkg/osutil/osutil_bsd.go index d139b9a76..b54c9126f 100644 --- a/pkg/osutil/osutil_bsd.go +++ b/pkg/osutil/osutil_bsd.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build freebsd || netbsd || openbsd -// +build freebsd netbsd openbsd package osutil diff --git a/pkg/osutil/osutil_fuchsia.go b/pkg/osutil/osutil_fuchsia.go index f1dad3aff..4103e7f52 100644 --- a/pkg/osutil/osutil_fuchsia.go +++ b/pkg/osutil/osutil_fuchsia.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build fuchsia -// +build fuchsia package osutil diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go index cf6b0284e..7243a7014 100644 --- a/pkg/osutil/osutil_unix.go +++ b/pkg/osutil/osutil_unix.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build freebsd || netbsd || openbsd || linux || darwin -// +build freebsd netbsd openbsd linux darwin package osutil diff --git a/pkg/osutil/sharedmem_file.go b/pkg/osutil/sharedmem_file.go index 1e969cdba..0d899fab5 100644 --- a/pkg/osutil/sharedmem_file.go +++ b/pkg/osutil/sharedmem_file.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build freebsd || netbsd || openbsd || darwin -// +build freebsd netbsd openbsd darwin package osutil diff --git a/pkg/osutil/sharedmem_memfd.go b/pkg/osutil/sharedmem_memfd.go index 213080e49..84077b9ec 100644 --- a/pkg/osutil/sharedmem_memfd.go +++ b/pkg/osutil/sharedmem_memfd.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build linux -// +build linux package osutil diff --git a/pkg/testutil/norace.go b/pkg/testutil/norace.go index ceb03928f..47cc90150 100644 --- a/pkg/testutil/norace.go +++ b/pkg/testutil/norace.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build !race -// +build !race package testutil diff --git a/pkg/testutil/race.go b/pkg/testutil/race.go index 96a9043bb..cdd242454 100644 --- a/pkg/testutil/race.go +++ b/pkg/testutil/race.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build race -// +build race package testutil diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index da65663e1..3c11b7e53 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -2,7 +2,6 @@ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. //go:build tools -// +build tools // tools is not a normal package, it's only purpose is tools dependency management. // It allows us to vendor all used tools, ensure that all contributors have the same versions of tools, -- cgit mrf-deployment