all: go fmt ./...

rsc · rsc · commit bdb1ca9a1e08 · 2021-02-20T03:30:13.000Z
Make all our package sources use Go 1.17 gofmt format (adding //go:build lines). Not strictly necessary but will avoid spurious changes as files are edited. Part of //go:build change (#41184). See https://golang.org/design/draft-gobuild Change-Id: I30822eb504168b037ed3ec0f7759da1f41251f52 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/294374 Trust: Russ Cox <rsc@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Robert Griesemer <gri@golang.org> Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
diff --git a/app/android.go b/app/android.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build android
 // +build android
 
 /*
diff --git a/app/app.go b/app/app.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin || windows
 // +build linux darwin windows
 
 package app
diff --git a/app/darwin_desktop.go b/app/darwin_desktop.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin
-// +build !ios
+//go:build darwin && !ios
+// +build darwin,!ios
 
 package app
 
diff --git a/app/darwin_ios.go b/app/darwin_ios.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin
-// +build ios
+//go:build darwin && ios
+// +build darwin,ios
 
 package app
 
diff --git a/app/internal/testapp/testapp.go b/app/internal/testapp/testapp.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux
 // +build darwin linux
 
 // Small test app used by app/app_test.go.
diff --git a/app/shiny.go b/app/shiny.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package app
diff --git a/app/x11.go b/app/x11.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux && !android
 // +build linux,!android
 
 package app
diff --git a/asset/asset.go b/asset/asset.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 package asset
diff --git a/asset/asset_darwin_armx.go b/asset/asset_darwin_armx.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin && (arm || arm64)
 // +build darwin
 // +build arm arm64
 
diff --git a/asset/asset_desktop.go b/asset/asset_desktop.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (linux && !android) || (darwin && !arm && !arm64) || windows
 // +build linux,!android darwin,!arm,!arm64 windows
 
 package asset
diff --git a/cmd/gomobile/gendex.go b/cmd/gomobile/gendex.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // Gendex generates a dex file used by Go apps created with gomobile.
diff --git a/example/basic/main.go b/example/basic/main.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 // An app that draws a green triangle on a red background.
diff --git a/example/basic/main_x.go b/example/basic/main_x.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !darwin && !linux && !windows
 // +build !darwin,!linux,!windows
 
 package main
diff --git a/example/flappy/game.go b/example/flappy/game.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux
 // +build darwin linux
 
 package main
diff --git a/example/flappy/main.go b/example/flappy/main.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux
 // +build darwin linux
 
 // Flappy Gopher is a simple one-button game that uses the
diff --git a/example/flappy/main_x.go b/example/flappy/main_x.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !darwin && !linux
 // +build !darwin,!linux
 
 package main
diff --git a/example/network/main.go b/example/network/main.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 // An app that paints green if golang.org is reachable when the app first
diff --git a/example/network/main_x.go b/example/network/main_x.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !darwin && !linux && !windows
 // +build !darwin,!linux,!windows
 
 package main
diff --git a/exp/app/debug/fps.go b/exp/app/debug/fps.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 // Package debug provides GL-based debugging tools for apps.
diff --git a/exp/audio/al/al.go b/exp/audio/al/al.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 // Package al provides OpenAL Soft bindings for Go.
diff --git a/exp/audio/al/al_notandroid.go b/exp/audio/al/al_notandroid.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || (linux && !android) || windows
 // +build darwin linux,!android windows
 
 package al
diff --git a/exp/audio/al/alc.go b/exp/audio/al/alc.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 package al
diff --git a/exp/audio/al/alc_notandroid.go b/exp/audio/al/alc_notandroid.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || (linux && !android) || windows
 // +build darwin linux,!android windows
 
 package al
diff --git a/exp/audio/al/const.go b/exp/audio/al/const.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 package al
diff --git a/exp/f32/gen.go b/exp/f32/gen.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/exp/font/font.go b/exp/font/font.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
 // +build linux darwin
 
 package font
diff --git a/exp/font/font_linux.go b/exp/font/font_linux.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !android
 // +build !android
 
 package font
diff --git a/exp/font/font_test.go b/exp/font/font_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
 // +build linux darwin
 
 package font
diff --git a/exp/gl/glutil/context_darwin_desktop.go b/exp/gl/glutil/context_darwin_desktop.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin
-// +build !ios
+//go:build darwin && !ios
+// +build darwin,!ios
 
 package glutil
 
diff --git a/exp/gl/glutil/context_x11.go b/exp/gl/glutil/context_x11.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux && !android
 // +build linux,!android
 
 package glutil
diff --git a/exp/gl/glutil/glimage.go b/exp/gl/glutil/glimage.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin || windows
 // +build linux darwin windows
 
 package glutil
diff --git a/exp/gl/glutil/glimage_test.go b/exp/gl/glutil/glimage_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || (linux && !android)
 // +build darwin linux,!android
 
 // TODO(crawshaw): Run tests on other OSs when more contexts are supported.
diff --git a/exp/gl/glutil/glutil.go b/exp/gl/glutil/glutil.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 package glutil // import "golang.org/x/mobile/exp/gl/glutil"
diff --git a/exp/sensor/android.go b/exp/sensor/android.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build android
 // +build android
 
 package sensor
diff --git a/exp/sensor/darwin_armx.go b/exp/sensor/darwin_armx.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin && (arm || arm64)
 // +build darwin
 // +build arm arm64
 
diff --git a/exp/sensor/notmobile.go b/exp/sensor/notmobile.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (linux && !android) || (darwin && !arm && !arm64) || windows
 // +build linux,!android darwin,!arm,!arm64 windows
 
 package sensor
diff --git a/exp/sprite/glsprite/glsprite.go b/exp/sprite/glsprite/glsprite.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || windows
 // +build darwin linux windows
 
 // Package glsprite implements a sprite Engine using OpenGL ES 2.
diff --git a/gl/gendebug.go b/gl/gendebug.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // The gendebug program takes gl.go and generates a version of it
diff --git a/gl/gl.go b/gl/gl.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (darwin || linux || openbsd || windows) && !gldebug
 // +build darwin linux openbsd windows
 // +build !gldebug
 
diff --git a/gl/gldebug.go b/gl/gldebug.go
diff --git a/gl/types_debug.go b/gl/types_debug.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (darwin || linux || openbsd || windows) && gldebug
 // +build darwin linux openbsd windows
 // +build gldebug
 
diff --git a/gl/types_prod.go b/gl/types_prod.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (darwin || linux || openbsd || windows) && !gldebug
 // +build darwin linux openbsd windows
 // +build !gldebug
 
diff --git a/gl/work.go b/gl/work.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || linux || openbsd
 // +build darwin linux openbsd
 
 package gl
diff --git a/gl/work_other.go b/gl/work_other.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (!cgo || (!darwin && !linux && !openbsd)) && !windows
 // +build !cgo !darwin,!linux,!openbsd
 // +build !windows
 
diff --git a/internal/binres/genarsc.go b/internal/binres/genarsc.go
diff --git a/internal/mobileinit/mobileinit_ios.go b/internal/mobileinit/mobileinit_ios.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin && (arm || arm64)
 // +build darwin
 // +build arm arm64
 
