go fmt

ipfs · May 3, 2022 · 679b8b1 · 679b8b1
1 parent 7025c6d
commit 679b8b1
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,6 @@
-// +build cgo,!noplugin
+//go:build cgo && !noplugin && (linux || darwin || freebsd)
+// +build cgo
+// +build !noplugin
 // +build linux darwin freebsd
 
 package loader