From 38c65ebc0710fb7b3343291487d4597ac0ff4cd8 Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Mon, 7 Aug 2023 12:36:24 -0400 Subject: [PATCH] all: delete obsolete // +build lines Many of the modules in x/exp say go 1.18 or newer in their go.mod files. Use go fix remove the // +build lines that have become obsolete by that Go version. See https://go.dev/doc/go1.18#go-build-lines. Change-Id: I9ec877d72ece76ce8ec2d4a368450db6ebda6d12 Reviewed-on: https://go-review.googlesource.com/c/exp/+/516676 Run-TryBot: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov Reviewed-by: Ian Lance Taylor Auto-Submit: Dmitri Shuralyov TryBot-Result: Gopher Robot --- cmd/macos-roots-test/main.go | 1 - cmd/macos-roots-test/root_nocgo_darwin.go | 1 - event/adapter/gokit/gokit_test.go | 1 - event/adapter/logr/logr_test.go | 1 - event/adapter/logrus/logrus.go | 1 - event/adapter/logrus/logrus_test.go | 1 - event/adapter/zap/zap.go | 1 - event/adapter/zap/zap_test.go | 1 - event/alloc_test.go | 1 - event/disabled.go | 1 - event/event_test.go | 1 - event/export.go | 1 - event/otel/trace_test.go | 1 - event/severity/severity_test.go | 1 - event/source.go | 1 - io/i2c/devfs.go | 1 - io/i2c/devfs_nonlinux.go | 1 - io/spi/devfs.go | 1 - io/spi/devfs_nonlinux.go | 1 - mmap/manual_test_program.go | 1 - mmap/mmap_other.go | 1 - mmap/mmap_unix.go | 1 - shiny/driver/driver_darwin.go | 1 - shiny/driver/driver_fallback.go | 5 ----- shiny/driver/driver_x11.go | 1 - shiny/driver/gldriver/cocoa.go | 1 - shiny/driver/gldriver/context.go | 1 - shiny/driver/gldriver/other.go | 4 ---- shiny/driver/gldriver/win32.go | 1 - shiny/driver/gldriver/x11.go | 1 - shiny/driver/internal/swizzle/swizzle_other.go | 1 - shiny/driver/internal/win32/key.go | 1 - shiny/driver/internal/win32/win32.go | 1 - shiny/driver/internal/x11key/gen.go | 1 - shiny/driver/mtldriver/buffer.go | 1 - shiny/driver/mtldriver/internal/appkit/appkit.go | 1 - shiny/driver/mtldriver/internal/coreanim/coreanim.go | 1 - shiny/driver/mtldriver/mtldriver.go | 1 - shiny/driver/mtldriver/screen.go | 1 - shiny/driver/mtldriver/texture.go | 1 - shiny/driver/mtldriver/window.go | 1 - shiny/driver/mtldriver_darwin.go | 1 - shiny/driver/windriver/buffer.go | 1 - shiny/driver/windriver/other.go | 1 - shiny/driver/windriver/screen.go | 1 - shiny/driver/windriver/texture.go | 1 - shiny/driver/windriver/window.go | 1 - shiny/driver/windriver/windraw.go | 1 - shiny/driver/windriver/windriver.go | 1 - shiny/driver/x11driver/shm_linux_ipc.go | 2 -- shiny/driver/x11driver/shm_openbsd_syscall.go | 2 -- shiny/driver/x11driver/shm_other.go | 1 - shiny/driver/x11driver/shm_shmopen_syscall.go | 2 -- shiny/materialdesign/colornames/gen.go | 1 - shiny/materialdesign/icons/gen.go | 1 - shiny/widget/glwidget/glwidget.go | 1 - slices/slices_race_test.go | 1 - typeparams/copytermlist.go | 1 - typeparams/example/findtypeparams/main.go | 1 - typeparams/example/genericmethods/main.go | 1 - typeparams/example/instantiation/main.go | 1 - typeparams/example/interfaces/main.go | 1 - typeparams/example/methoddecls/main.go | 1 - typeparams/typeparams_go117.go | 1 - typeparams/typeparams_go118.go | 1 - typeparams/typeparams_test.go | 1 - 66 files changed, 76 deletions(-) diff --git a/cmd/macos-roots-test/main.go b/cmd/macos-roots-test/main.go index db2bfe623..a7d2c802a 100644 --- a/cmd/macos-roots-test/main.go +++ b/cmd/macos-roots-test/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin // Command macOS-roots-test runs crypto/x509.TestSystemRoots as a // stand-alone binary for crowdsourced testing. diff --git a/cmd/macos-roots-test/root_nocgo_darwin.go b/cmd/macos-roots-test/root_nocgo_darwin.go index cdf44d47e..94c610520 100644 --- a/cmd/macos-roots-test/root_nocgo_darwin.go +++ b/cmd/macos-roots-test/root_nocgo_darwin.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !cgo -// +build !cgo package main diff --git a/event/adapter/gokit/gokit_test.go b/event/adapter/gokit/gokit_test.go index e12bdbfee..29169f85c 100644 --- a/event/adapter/gokit/gokit_test.go +++ b/event/adapter/gokit/gokit_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package gokit_test diff --git a/event/adapter/logr/logr_test.go b/event/adapter/logr/logr_test.go index f8d62f6bd..aaa877e27 100644 --- a/event/adapter/logr/logr_test.go +++ b/event/adapter/logr/logr_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package logr_test diff --git a/event/adapter/logrus/logrus.go b/event/adapter/logrus/logrus.go index 7924882e4..ed2fa3b62 100644 --- a/event/adapter/logrus/logrus.go +++ b/event/adapter/logrus/logrus.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events // Package logrus provides a logrus Formatter for events. // To use for the global logger: diff --git a/event/adapter/logrus/logrus_test.go b/event/adapter/logrus/logrus_test.go index 6e76f3ad7..040494028 100644 --- a/event/adapter/logrus/logrus_test.go +++ b/event/adapter/logrus/logrus_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package logrus_test diff --git a/event/adapter/zap/zap.go b/event/adapter/zap/zap.go index c59d9a71f..6fe8a277a 100644 --- a/event/adapter/zap/zap.go +++ b/event/adapter/zap/zap.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events // zap provides an implementation of zapcore.Core for events. // To use globally: diff --git a/event/adapter/zap/zap_test.go b/event/adapter/zap/zap_test.go index 787b6b4ce..ed2e03cae 100644 --- a/event/adapter/zap/zap_test.go +++ b/event/adapter/zap/zap_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package zap_test diff --git a/event/alloc_test.go b/event/alloc_test.go index 533ef9c4d..1cf7e7539 100644 --- a/event/alloc_test.go +++ b/event/alloc_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !race -// +build !race package event_test diff --git a/event/disabled.go b/event/disabled.go index 385a6c604..7aee0bd14 100644 --- a/event/disabled.go +++ b/event/disabled.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build disable_events -// +build disable_events package event diff --git a/event/event_test.go b/event/event_test.go index 1757a976b..5899988bc 100644 --- a/event/event_test.go +++ b/event/event_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package event_test diff --git a/event/export.go b/event/export.go index f52de4575..5dc7f0291 100644 --- a/event/export.go +++ b/event/export.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package event diff --git a/event/otel/trace_test.go b/event/otel/trace_test.go index 6813fe40b..81d369fb4 100644 --- a/event/otel/trace_test.go +++ b/event/otel/trace_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package otel_test diff --git a/event/severity/severity_test.go b/event/severity/severity_test.go index 5f3183212..b5ca973e3 100644 --- a/event/severity/severity_test.go +++ b/event/severity/severity_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package severity_test diff --git a/event/source.go b/event/source.go index 05d9aa923..3af0bd40b 100644 --- a/event/source.go +++ b/event/source.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !disable_events -// +build !disable_events package event diff --git a/io/i2c/devfs.go b/io/i2c/devfs.go index 3c7704f3f..06a45f19e 100644 --- a/io/i2c/devfs.go +++ b/io/i2c/devfs.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package i2c diff --git a/io/i2c/devfs_nonlinux.go b/io/i2c/devfs_nonlinux.go index 619fb9f8c..3cc48cdb2 100644 --- a/io/i2c/devfs_nonlinux.go +++ b/io/i2c/devfs_nonlinux.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux -// +build !linux package i2c diff --git a/io/spi/devfs.go b/io/spi/devfs.go index a5f1bcaf0..f67df50f0 100644 --- a/io/spi/devfs.go +++ b/io/spi/devfs.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package spi diff --git a/io/spi/devfs_nonlinux.go b/io/spi/devfs_nonlinux.go index 499d69d1b..e04d7ea2e 100644 --- a/io/spi/devfs_nonlinux.go +++ b/io/spi/devfs_nonlinux.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux -// +build !linux package spi diff --git a/mmap/manual_test_program.go b/mmap/manual_test_program.go index 5c212b635..b956b5c42 100644 --- a/mmap/manual_test_program.go +++ b/mmap/manual_test_program.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // // This build tag means that "go build" does not build this file. Use "go run diff --git a/mmap/mmap_other.go b/mmap/mmap_other.go index 1e7b94864..799cd7c8a 100644 --- a/mmap/mmap_other.go +++ b/mmap/mmap_other.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux && !windows && !darwin -// +build !linux,!windows,!darwin // Package mmap provides a way to memory-map a file. package mmap diff --git a/mmap/mmap_unix.go b/mmap/mmap_unix.go index 5ceb69be7..0b92cdb68 100644 --- a/mmap/mmap_unix.go +++ b/mmap/mmap_unix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux || darwin -// +build linux darwin // Package mmap provides a way to memory-map a file. package mmap diff --git a/shiny/driver/driver_darwin.go b/shiny/driver/driver_darwin.go index 3eebcf725..43f79cfe1 100644 --- a/shiny/driver/driver_darwin.go +++ b/shiny/driver/driver_darwin.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && !metal -// +build darwin,!metal package driver diff --git a/shiny/driver/driver_fallback.go b/shiny/driver/driver_fallback.go index e36fbc548..93b0c1937 100644 --- a/shiny/driver/driver_fallback.go +++ b/shiny/driver/driver_fallback.go @@ -3,11 +3,6 @@ // license that can be found in the LICENSE file. //go:build !darwin && (!linux || android) && !windows && !dragonfly && !openbsd -// +build !darwin -// +build !linux android -// +build !windows -// +build !dragonfly -// +build !openbsd package driver diff --git a/shiny/driver/driver_x11.go b/shiny/driver/driver_x11.go index bc24238ff..5f9b83940 100644 --- a/shiny/driver/driver_x11.go +++ b/shiny/driver/driver_x11.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (linux && !android) || dragonfly || openbsd -// +build linux,!android dragonfly openbsd package driver diff --git a/shiny/driver/gldriver/cocoa.go b/shiny/driver/gldriver/cocoa.go index db5ba6366..99dad1317 100644 --- a/shiny/driver/gldriver/cocoa.go +++ b/shiny/driver/gldriver/cocoa.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && !ios -// +build darwin,!ios package gldriver diff --git a/shiny/driver/gldriver/context.go b/shiny/driver/gldriver/context.go index 274d79968..488a38867 100644 --- a/shiny/driver/gldriver/context.go +++ b/shiny/driver/gldriver/context.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !android -// +build !android package gldriver diff --git a/shiny/driver/gldriver/other.go b/shiny/driver/gldriver/other.go index 0a0442545..f762750ac 100644 --- a/shiny/driver/gldriver/other.go +++ b/shiny/driver/gldriver/other.go @@ -3,10 +3,6 @@ // license that can be found in the LICENSE file. //go:build (!darwin || ios || !cgo) && (!linux || android || !cgo) && (!openbsd || !cgo) && !windows -// +build !darwin ios !cgo -// +build !linux android !cgo -// +build !openbsd !cgo -// +build !windows package gldriver diff --git a/shiny/driver/gldriver/win32.go b/shiny/driver/gldriver/win32.go index 8ece242f5..c94549ed5 100755 --- a/shiny/driver/gldriver/win32.go +++ b/shiny/driver/gldriver/win32.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package gldriver diff --git a/shiny/driver/gldriver/x11.go b/shiny/driver/gldriver/x11.go index 4847e85b2..0ccdd59fc 100644 --- a/shiny/driver/gldriver/x11.go +++ b/shiny/driver/gldriver/x11.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (linux && !android) || openbsd -// +build linux,!android openbsd package gldriver diff --git a/shiny/driver/internal/swizzle/swizzle_other.go b/shiny/driver/internal/swizzle/swizzle_other.go index f1c2726ee..4bf77511a 100644 --- a/shiny/driver/internal/swizzle/swizzle_other.go +++ b/shiny/driver/internal/swizzle/swizzle_other.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !amd64 -// +build !amd64 package swizzle diff --git a/shiny/driver/internal/win32/key.go b/shiny/driver/internal/win32/key.go index a5748c320..da75d9a96 100644 --- a/shiny/driver/internal/win32/key.go +++ b/shiny/driver/internal/win32/key.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package win32 diff --git a/shiny/driver/internal/win32/win32.go b/shiny/driver/internal/win32/win32.go index 22a601395..c020ce693 100644 --- a/shiny/driver/internal/win32/win32.go +++ b/shiny/driver/internal/win32/win32.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package win32 implements a partial shiny screen driver using the Win32 API. // It provides window, lifecycle, key, and mouse management, but no drawing. diff --git a/shiny/driver/internal/x11key/gen.go b/shiny/driver/internal/x11key/gen.go index 3ce4f1edb..72201aab3 100644 --- a/shiny/driver/internal/x11key/gen.go +++ b/shiny/driver/internal/x11key/gen.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // This program generates the table keysymCodePoints from /usr/include/X11/keysymdef.h package main diff --git a/shiny/driver/mtldriver/buffer.go b/shiny/driver/mtldriver/buffer.go index 987d75ade..ef13fae98 100644 --- a/shiny/driver/mtldriver/buffer.go +++ b/shiny/driver/mtldriver/buffer.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin package mtldriver diff --git a/shiny/driver/mtldriver/internal/appkit/appkit.go b/shiny/driver/mtldriver/internal/appkit/appkit.go index 7140f6f9b..cf1ed5e16 100644 --- a/shiny/driver/mtldriver/internal/appkit/appkit.go +++ b/shiny/driver/mtldriver/internal/appkit/appkit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin // Package appkit provides access to Apple's AppKit API // (https://developer.apple.com/documentation/appkit). diff --git a/shiny/driver/mtldriver/internal/coreanim/coreanim.go b/shiny/driver/mtldriver/internal/coreanim/coreanim.go index 257b783c7..19ee694d4 100644 --- a/shiny/driver/mtldriver/internal/coreanim/coreanim.go +++ b/shiny/driver/mtldriver/internal/coreanim/coreanim.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin // Package coreanim provides access to Apple's Core Animation API // (https://developer.apple.com/documentation/quartzcore). diff --git a/shiny/driver/mtldriver/mtldriver.go b/shiny/driver/mtldriver/mtldriver.go index a926b92af..3f5c36c78 100644 --- a/shiny/driver/mtldriver/mtldriver.go +++ b/shiny/driver/mtldriver/mtldriver.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin // Package mtldriver provides a Metal driver for accessing a screen. // diff --git a/shiny/driver/mtldriver/screen.go b/shiny/driver/mtldriver/screen.go index 544de7c33..71cbabc88 100644 --- a/shiny/driver/mtldriver/screen.go +++ b/shiny/driver/mtldriver/screen.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin package mtldriver diff --git a/shiny/driver/mtldriver/texture.go b/shiny/driver/mtldriver/texture.go index 60185eef8..f0a801fb5 100644 --- a/shiny/driver/mtldriver/texture.go +++ b/shiny/driver/mtldriver/texture.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin package mtldriver diff --git a/shiny/driver/mtldriver/window.go b/shiny/driver/mtldriver/window.go index 7bbb837ca..b21a8a82b 100644 --- a/shiny/driver/mtldriver/window.go +++ b/shiny/driver/mtldriver/window.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin package mtldriver diff --git a/shiny/driver/mtldriver_darwin.go b/shiny/driver/mtldriver_darwin.go index a30cd27ac..4e910c553 100644 --- a/shiny/driver/mtldriver_darwin.go +++ b/shiny/driver/mtldriver_darwin.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && metal -// +build darwin,metal package driver diff --git a/shiny/driver/windriver/buffer.go b/shiny/driver/windriver/buffer.go index eeff37884..10e42c7ac 100644 --- a/shiny/driver/windriver/buffer.go +++ b/shiny/driver/windriver/buffer.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windriver diff --git a/shiny/driver/windriver/other.go b/shiny/driver/windriver/other.go index 2da4c44fd..f533187ed 100644 --- a/shiny/driver/windriver/other.go +++ b/shiny/driver/windriver/other.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !windows -// +build !windows package windriver diff --git a/shiny/driver/windriver/screen.go b/shiny/driver/windriver/screen.go index 148b4efc1..bc64df0af 100644 --- a/shiny/driver/windriver/screen.go +++ b/shiny/driver/windriver/screen.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windriver diff --git a/shiny/driver/windriver/texture.go b/shiny/driver/windriver/texture.go index 6fbfff56b..5857686da 100644 --- a/shiny/driver/windriver/texture.go +++ b/shiny/driver/windriver/texture.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windriver diff --git a/shiny/driver/windriver/window.go b/shiny/driver/windriver/window.go index 9577f2c69..3937f4b16 100644 --- a/shiny/driver/windriver/window.go +++ b/shiny/driver/windriver/window.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windriver diff --git a/shiny/driver/windriver/windraw.go b/shiny/driver/windriver/windraw.go index b5e6b15f3..4e3fd2f79 100644 --- a/shiny/driver/windriver/windraw.go +++ b/shiny/driver/windriver/windraw.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windriver diff --git a/shiny/driver/windriver/windriver.go b/shiny/driver/windriver/windriver.go index 73a5420f1..b6d0fb623 100644 --- a/shiny/driver/windriver/windriver.go +++ b/shiny/driver/windriver/windriver.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windriver diff --git a/shiny/driver/x11driver/shm_linux_ipc.go b/shiny/driver/x11driver/shm_linux_ipc.go index 23fe9a41e..dcb61ac0d 100644 --- a/shiny/driver/x11driver/shm_linux_ipc.go +++ b/shiny/driver/x11driver/shm_linux_ipc.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (386 || ppc64 || ppc64le || s390x) -// +build linux -// +build 386 ppc64 ppc64le s390x package x11driver diff --git a/shiny/driver/x11driver/shm_openbsd_syscall.go b/shiny/driver/x11driver/shm_openbsd_syscall.go index d42cb4cd8..d8dc2c16c 100644 --- a/shiny/driver/x11driver/shm_openbsd_syscall.go +++ b/shiny/driver/x11driver/shm_openbsd_syscall.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build openbsd && (i386 || amd64) -// +build openbsd -// +build i386 amd64 package x11driver diff --git a/shiny/driver/x11driver/shm_other.go b/shiny/driver/x11driver/shm_other.go index fa071c3cb..8003f140d 100644 --- a/shiny/driver/x11driver/shm_other.go +++ b/shiny/driver/x11driver/shm_other.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux && !dragonfly && !openbsd -// +build !linux,!dragonfly,!openbsd package x11driver diff --git a/shiny/driver/x11driver/shm_shmopen_syscall.go b/shiny/driver/x11driver/shm_shmopen_syscall.go index 45d737372..74f571bc3 100644 --- a/shiny/driver/x11driver/shm_shmopen_syscall.go +++ b/shiny/driver/x11driver/shm_shmopen_syscall.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (linux || dragonfly) && (amd64 || arm || arm64 || mips64 || mips64le) -// +build linux dragonfly -// +build amd64 arm arm64 mips64 mips64le package x11driver diff --git a/shiny/materialdesign/colornames/gen.go b/shiny/materialdesign/colornames/gen.go index f663952dd..aa09e93f7 100644 --- a/shiny/materialdesign/colornames/gen.go +++ b/shiny/materialdesign/colornames/gen.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // This program generates table.go from // https://material.google.com/style/color.html diff --git a/shiny/materialdesign/icons/gen.go b/shiny/materialdesign/icons/gen.go index 2e95bfc8e..150318bdf 100644 --- a/shiny/materialdesign/icons/gen.go +++ b/shiny/materialdesign/icons/gen.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/shiny/widget/glwidget/glwidget.go b/shiny/widget/glwidget/glwidget.go index 3122377b7..63b9a6a39 100644 --- a/shiny/widget/glwidget/glwidget.go +++ b/shiny/widget/glwidget/glwidget.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !android -// +build !android // Package glwidget provides a widget containing a GL ES framebuffer. package glwidget diff --git a/slices/slices_race_test.go b/slices/slices_race_test.go index c85d6ee7e..5a2a15d6e 100644 --- a/slices/slices_race_test.go +++ b/slices/slices_race_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build race -// +build race package slices diff --git a/typeparams/copytermlist.go b/typeparams/copytermlist.go index ffe997ae7..c67dc1782 100644 --- a/typeparams/copytermlist.go +++ b/typeparams/copytermlist.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // copytermlist.go copies the term list algorithm from GOROOT/src/go/types. // Run it with: diff --git a/typeparams/example/findtypeparams/main.go b/typeparams/example/findtypeparams/main.go index 50a1fcc92..2026ba285 100644 --- a/typeparams/example/findtypeparams/main.go +++ b/typeparams/example/findtypeparams/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package main diff --git a/typeparams/example/genericmethods/main.go b/typeparams/example/genericmethods/main.go index 8acdcf2a5..6aa5e7af5 100644 --- a/typeparams/example/genericmethods/main.go +++ b/typeparams/example/genericmethods/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package main diff --git a/typeparams/example/instantiation/main.go b/typeparams/example/instantiation/main.go index 11e19c126..ed536675f 100644 --- a/typeparams/example/instantiation/main.go +++ b/typeparams/example/instantiation/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package main diff --git a/typeparams/example/interfaces/main.go b/typeparams/example/interfaces/main.go index 9f9ac62e6..6a0d62785 100644 --- a/typeparams/example/interfaces/main.go +++ b/typeparams/example/interfaces/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package main diff --git a/typeparams/example/methoddecls/main.go b/typeparams/example/methoddecls/main.go index da19befb8..52ae8be1f 100644 --- a/typeparams/example/methoddecls/main.go +++ b/typeparams/example/methoddecls/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package main diff --git a/typeparams/typeparams_go117.go b/typeparams/typeparams_go117.go index efc33f10f..c1da79316 100644 --- a/typeparams/typeparams_go117.go +++ b/typeparams/typeparams_go117.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !go1.18 -// +build !go1.18 package typeparams diff --git a/typeparams/typeparams_go118.go b/typeparams/typeparams_go118.go index 1176104b2..0b35449d1 100644 --- a/typeparams/typeparams_go118.go +++ b/typeparams/typeparams_go118.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package typeparams diff --git a/typeparams/typeparams_test.go b/typeparams/typeparams_test.go index 50d1e2e39..2136a598a 100644 --- a/typeparams/typeparams_test.go +++ b/typeparams/typeparams_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.18 -// +build go1.18 package typeparams_test