From 1f37a1481b095bfd52a73ea7531941c66e4459ab Mon Sep 17 00:00:00 2001 From: Adin Schmahmann Date: Tue, 3 May 2022 11:58:03 -0400 Subject: [PATCH] go fmt --- cmd/ipfs/daemon_linux.go | 1 + cmd/ipfs/daemon_other.go | 1 + cmd/ipfs/runmain_test.go | 1 + cmd/ipfs/util/signal.go | 1 + cmd/ipfs/util/ui.go | 3 ++- cmd/ipfs/util/ulimit_freebsd.go | 1 + cmd/ipfs/util/ulimit_test.go | 1 + cmd/ipfs/util/ulimit_unix.go | 1 + cmd/ipfs/util/ulimit_windows.go | 1 + cmd/ipfswatch/ipfswatch_test.go | 1 + core/commands/mount_nofuse.go | 1 + core/commands/root.go | 10 +++++----- coverage/main/main.go | 1 + fuse/ipns/ipns_test.go | 1 + fuse/ipns/ipns_unix.go | 1 + fuse/ipns/link_unix.go | 1 + fuse/ipns/mount_unix.go | 1 + fuse/mount/fuse.go | 1 + fuse/node/mount_darwin.go | 1 + fuse/node/mount_nofuse.go | 1 + fuse/node/mount_notsupp.go | 1 + fuse/node/mount_test.go | 1 + fuse/node/mount_unix.go | 1 + fuse/readonly/ipfs_test.go | 1 + fuse/readonly/mount_unix.go | 1 + plugin/loader/load_nocgo.go | 4 +++- plugin/loader/load_noplugin.go | 1 + plugin/loader/load_unix.go | 4 +++- test/dependencies/dependencies.go | 1 + 29 files changed, 38 insertions(+), 8 deletions(-) diff --git a/cmd/ipfs/daemon_linux.go b/cmd/ipfs/daemon_linux.go index a1123b003..d06baf286 100644 --- a/cmd/ipfs/daemon_linux.go +++ b/cmd/ipfs/daemon_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package main diff --git a/cmd/ipfs/daemon_other.go b/cmd/ipfs/daemon_other.go index 4ffdd8b8e..cb96ce1b9 100644 --- a/cmd/ipfs/daemon_other.go +++ b/cmd/ipfs/daemon_other.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package main diff --git a/cmd/ipfs/runmain_test.go b/cmd/ipfs/runmain_test.go index 8eecce334..360f2bc53 100644 --- a/cmd/ipfs/runmain_test.go +++ b/cmd/ipfs/runmain_test.go @@ -1,3 +1,4 @@ +//go:build testrunmain // +build testrunmain package main diff --git a/cmd/ipfs/util/signal.go b/cmd/ipfs/util/signal.go index 393a953b9..2cfd0d5bd 100644 --- a/cmd/ipfs/util/signal.go +++ b/cmd/ipfs/util/signal.go @@ -1,3 +1,4 @@ +//go:build !wasm // +build !wasm package util diff --git a/cmd/ipfs/util/ui.go b/cmd/ipfs/util/ui.go index d68c9d7a5..cf8ad5067 100644 --- a/cmd/ipfs/util/ui.go +++ b/cmd/ipfs/util/ui.go @@ -1,4 +1,5 @@ -//+build !windows +//go:build !windows +// +build !windows package util diff --git a/cmd/ipfs/util/ulimit_freebsd.go b/cmd/ipfs/util/ulimit_freebsd.go index d4a36de44..27b31349b 100644 --- a/cmd/ipfs/util/ulimit_freebsd.go +++ b/cmd/ipfs/util/ulimit_freebsd.go @@ -1,3 +1,4 @@ +//go:build freebsd // +build freebsd package util diff --git a/cmd/ipfs/util/ulimit_test.go b/cmd/ipfs/util/ulimit_test.go index 80862ee58..bef480fff 100644 --- a/cmd/ipfs/util/ulimit_test.go +++ b/cmd/ipfs/util/ulimit_test.go @@ -1,3 +1,4 @@ +//go:build !windows && !plan9 // +build !windows,!plan9 package util diff --git a/cmd/ipfs/util/ulimit_unix.go b/cmd/ipfs/util/ulimit_unix.go index ee30dadaf..d3b0ec43c 100644 --- a/cmd/ipfs/util/ulimit_unix.go +++ b/cmd/ipfs/util/ulimit_unix.go @@ -1,3 +1,4 @@ +//go:build darwin || linux || netbsd || openbsd // +build darwin linux netbsd openbsd package util diff --git a/cmd/ipfs/util/ulimit_windows.go b/cmd/ipfs/util/ulimit_windows.go index 3cd9908c3..5dbfd26f7 100644 --- a/cmd/ipfs/util/ulimit_windows.go +++ b/cmd/ipfs/util/ulimit_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package util diff --git a/cmd/ipfswatch/ipfswatch_test.go b/cmd/ipfswatch/ipfswatch_test.go index f6a6f7eec..b5a41c6bc 100644 --- a/cmd/ipfswatch/ipfswatch_test.go +++ b/cmd/ipfswatch/ipfswatch_test.go @@ -1,3 +1,4 @@ +//go:build !plan9 // +build !plan9 package main diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index ea5350688..46e9df0ce 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -1,3 +1,4 @@ +//go:build !windows && nofuse // +build !windows,nofuse package commands diff --git a/core/commands/root.go b/core/commands/root.go index bbdb01976..87bc3fd6f 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -21,11 +21,11 @@ var ErrNotOnline = errors.New("this command must be run in online mode. Try runn const ( RepoDirOption = "repo-dir" ConfigFileOption = "config-file" - ConfigOption = "config" - DebugOption = "debug" - LocalOption = "local" // DEPRECATED: use OfflineOption - OfflineOption = "offline" - ApiOption = "api" + ConfigOption = "config" + DebugOption = "debug" + LocalOption = "local" // DEPRECATED: use OfflineOption + OfflineOption = "offline" + ApiOption = "api" ) var Root = &cmds.Command{ diff --git a/coverage/main/main.go b/coverage/main/main.go index be616e08d..7efa0f694 100644 --- a/coverage/main/main.go +++ b/coverage/main/main.go @@ -1,3 +1,4 @@ +//go:build testrunmain // +build testrunmain package main diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index e9fce1654..cc725d8cb 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -1,3 +1,4 @@ +//go:build !nofuse && !openbsd && !netbsd && !plan9 // +build !nofuse,!openbsd,!netbsd,!plan9 package ipns diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index b8caf0ca2..413999b9e 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -1,3 +1,4 @@ +//go:build !nofuse && !openbsd && !netbsd && !plan9 // +build !nofuse,!openbsd,!netbsd,!plan9 // package fuse/ipns implements a fuse filesystem that interfaces diff --git a/fuse/ipns/link_unix.go b/fuse/ipns/link_unix.go index 3be52da99..355787b3c 100644 --- a/fuse/ipns/link_unix.go +++ b/fuse/ipns/link_unix.go @@ -1,3 +1,4 @@ +//go:build !nofuse && !openbsd && !netbsd && !plan9 // +build !nofuse,!openbsd,!netbsd,!plan9 package ipns diff --git a/fuse/ipns/mount_unix.go b/fuse/ipns/mount_unix.go index 7c24e53be..c59701146 100644 --- a/fuse/ipns/mount_unix.go +++ b/fuse/ipns/mount_unix.go @@ -1,3 +1,4 @@ +//go:build (linux || darwin || freebsd || netbsd || openbsd) && !nofuse // +build linux darwin freebsd netbsd openbsd // +build !nofuse diff --git a/fuse/mount/fuse.go b/fuse/mount/fuse.go index 7fd29e33d..99f374043 100644 --- a/fuse/mount/fuse.go +++ b/fuse/mount/fuse.go @@ -1,3 +1,4 @@ +//go:build !nofuse && !windows && !openbsd && !netbsd && !plan9 // +build !nofuse,!windows,!openbsd,!netbsd,!plan9 package mount diff --git a/fuse/node/mount_darwin.go b/fuse/node/mount_darwin.go index a27d64ccd..382f575e2 100644 --- a/fuse/node/mount_darwin.go +++ b/fuse/node/mount_darwin.go @@ -1,3 +1,4 @@ +//go:build !nofuse // +build !nofuse package node diff --git a/fuse/node/mount_nofuse.go b/fuse/node/mount_nofuse.go index 7f824ef3e..a5433c8c3 100644 --- a/fuse/node/mount_nofuse.go +++ b/fuse/node/mount_nofuse.go @@ -1,3 +1,4 @@ +//go:build !windows && nofuse // +build !windows,nofuse package node diff --git a/fuse/node/mount_notsupp.go b/fuse/node/mount_notsupp.go index c1cd625a1..d0db6f6b4 100644 --- a/fuse/node/mount_notsupp.go +++ b/fuse/node/mount_notsupp.go @@ -1,3 +1,4 @@ +//go:build (!nofuse && openbsd) || (!nofuse && netbsd) || (!nofuse && plan9) // +build !nofuse,openbsd !nofuse,netbsd !nofuse,plan9 package node diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go index 2d1642cb9..23eba3bc3 100644 --- a/fuse/node/mount_test.go +++ b/fuse/node/mount_test.go @@ -1,3 +1,4 @@ +//go:build !openbsd && !nofuse && !netbsd && !plan9 // +build !openbsd,!nofuse,!netbsd,!plan9 package node diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go index 5388333ac..852284357 100644 --- a/fuse/node/mount_unix.go +++ b/fuse/node/mount_unix.go @@ -1,3 +1,4 @@ +//go:build !windows && !openbsd && !netbsd && !plan9 && !nofuse // +build !windows,!openbsd,!netbsd,!plan9,!nofuse package node diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index feb2d4ec4..d869e3d5d 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -1,3 +1,4 @@ +//go:build !nofuse && !openbsd && !netbsd && !plan9 // +build !nofuse,!openbsd,!netbsd,!plan9 package readonly diff --git a/fuse/readonly/mount_unix.go b/fuse/readonly/mount_unix.go index e1065a2a1..719cb5ef2 100644 --- a/fuse/readonly/mount_unix.go +++ b/fuse/readonly/mount_unix.go @@ -1,3 +1,4 @@ +//go:build (linux || darwin || freebsd) && !nofuse // +build linux darwin freebsd // +build !nofuse diff --git a/plugin/loader/load_nocgo.go b/plugin/loader/load_nocgo.go index 3c73059e1..26bb215f2 100644 --- a/plugin/loader/load_nocgo.go +++ b/plugin/loader/load_nocgo.go @@ -1,4 +1,6 @@ -// +build !cgo,!noplugin +//go:build !cgo && !noplugin && (linux || darwin || freebsd) +// +build !cgo +// +build !noplugin // +build linux darwin freebsd package loader diff --git a/plugin/loader/load_noplugin.go b/plugin/loader/load_noplugin.go index dfe1e3cac..25b1c0c38 100644 --- a/plugin/loader/load_noplugin.go +++ b/plugin/loader/load_noplugin.go @@ -1,3 +1,4 @@ +//go:build noplugin // +build noplugin package loader diff --git a/plugin/loader/load_unix.go b/plugin/loader/load_unix.go index e7d744cbd..19ca49889 100644 --- a/plugin/loader/load_unix.go +++ b/plugin/loader/load_unix.go @@ -1,4 +1,6 @@ -// +build cgo,!noplugin +//go:build cgo && !noplugin && (linux || darwin || freebsd) +// +build cgo +// +build !noplugin // +build linux darwin freebsd package loader diff --git a/test/dependencies/dependencies.go b/test/dependencies/dependencies.go index 9dc489698..0d56cd5a7 100644 --- a/test/dependencies/dependencies.go +++ b/test/dependencies/dependencies.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools package tools