From 1735441939fd47d89bee928823957e03535aed96 Mon Sep 17 00:00:00 2001 From: Michael McLoughlin Date: Sat, 13 Apr 2019 22:53:13 -0500 Subject: [PATCH] all: apply gofumpt (#79) Apply @mvdan's opinionated gofumpt formatter across the codebase. --- README.md | 4 +--- examples/add/README.md | 4 +--- examples/add/asm.go | 4 +--- examples/args/asm.go | 4 +--- examples/complex/asm.go | 4 +--- examples/ext/asm.go | 4 +--- examples/geohash/geohash_test.go | 4 +--- examples/sha1/sha1.go | 4 +--- examples/stadtx/stadtx.go | 1 - examples/stadtx/stadtx_test.go | 5 +---- internal/load/tables.go | 4 +--- internal/opcodescsv/analysis_test.go | 4 +--- internal/opcodesxml/opcodesxml_test.go | 4 +--- operand/checks.go | 4 +--- operand/make_const.go | 4 +--- tests/cast/asm.go | 4 +--- tests/fixedbugs/issue50/asm.go | 4 +--- tests/fixedbugs/issue62/asm.go | 4 +--- tests/fixedbugs/issue62/issue62_test.go | 4 +--- 19 files changed, 18 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 073eb27..a6c13ee 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,7 @@ $ go get -u github.com/mmcloughlin/avo package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { TEXT("Add", NOSPLIT, "func(x, y uint64) uint64") diff --git a/examples/add/README.md b/examples/add/README.md index 600ca19..6d19a66 100644 --- a/examples/add/README.md +++ b/examples/add/README.md @@ -10,9 +10,7 @@ The [code generator](asm.go) is as follows: package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { TEXT("Add", NOSPLIT, "func(x, y uint64) uint64") diff --git a/examples/add/asm.go b/examples/add/asm.go index 44c7aa2..d372230 100644 --- a/examples/add/asm.go +++ b/examples/add/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { TEXT("Add", NOSPLIT, "func(x, y uint64) uint64") diff --git a/examples/args/asm.go b/examples/args/asm.go index ee04e7a..987b277 100644 --- a/examples/args/asm.go +++ b/examples/args/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { Package("github.com/mmcloughlin/avo/examples/args") diff --git a/examples/complex/asm.go b/examples/complex/asm.go index 1b9eecc..358ef80 100644 --- a/examples/complex/asm.go +++ b/examples/complex/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { TEXT("Real", NOSPLIT, "func(z complex128) float64") diff --git a/examples/ext/asm.go b/examples/ext/asm.go index bfa8079..cd7005c 100644 --- a/examples/ext/asm.go +++ b/examples/ext/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { Package("github.com/mmcloughlin/avo/examples/ext") diff --git a/examples/geohash/geohash_test.go b/examples/geohash/geohash_test.go index 6605ada..4db763e 100644 --- a/examples/geohash/geohash_test.go +++ b/examples/geohash/geohash_test.go @@ -1,8 +1,6 @@ package geohash -import ( - "testing" -) +import "testing" //go:generate go run asm.go -out geohash.s -stubs stub.go diff --git a/examples/sha1/sha1.go b/examples/sha1/sha1.go index bb944c7..b5e974b 100644 --- a/examples/sha1/sha1.go +++ b/examples/sha1/sha1.go @@ -1,8 +1,6 @@ package sha1 -import ( - "encoding/binary" -) +import "encoding/binary" // Size of a SHA-1 checksum in bytes. const Size = 20 diff --git a/examples/stadtx/stadtx.go b/examples/stadtx/stadtx.go index e83adf3..862b418 100644 --- a/examples/stadtx/stadtx.go +++ b/examples/stadtx/stadtx.go @@ -28,7 +28,6 @@ func scramble64(v, prime uint64) uint64 { } func SeedState(seed []uint64) State { - var state State state[0] = seed[0] ^ 0x43f6a8885a308d31 diff --git a/examples/stadtx/stadtx_test.go b/examples/stadtx/stadtx_test.go index cccb791..093a235 100644 --- a/examples/stadtx/stadtx_test.go +++ b/examples/stadtx/stadtx_test.go @@ -2,9 +2,7 @@ package stadtx -import ( - "testing" -) +import "testing" /* @@ -39,7 +37,6 @@ int main() */ func TestHash(t *testing.T) { - var tests = []uint64{ 0x0db6608af30c8cc1, 0xe3ffb1e1a2273589, 0xc34df40f05c3d43a, 0xf79284a93cd817cf, 0x178aed7315bcd4b9, 0x48a29a42948da116, 0xa78613b72330a064, 0xa23cd23f7b6eaef7, 0x7e4c118aca1d7886, 0x37059645f8797936, 0xcb7197e3253670cb, 0x5dadeebe5a5bc19f, 0x537057981e3f75ad, 0x41d57f7870fbcbf8, 0x7fc3cd6b1bb018c2, 0xbf98dbc2a88c5050, diff --git a/internal/load/tables.go b/internal/load/tables.go index 185db28..d00c950 100644 --- a/internal/load/tables.go +++ b/internal/load/tables.go @@ -1,8 +1,6 @@ package load -import ( - "github.com/mmcloughlin/avo/internal/inst" -) +import "github.com/mmcloughlin/avo/internal/inst" // alias defines an opcode alias. type alias struct { diff --git a/internal/opcodescsv/analysis_test.go b/internal/opcodescsv/analysis_test.go index 7f40165..e9e371c 100644 --- a/internal/opcodescsv/analysis_test.go +++ b/internal/opcodescsv/analysis_test.go @@ -1,8 +1,6 @@ package opcodescsv -import ( - "testing" -) +import "testing" func TestBuildOrderMap(t *testing.T) { is, err := ReadFile("testdata/x86.v0.2.csv") diff --git a/internal/opcodesxml/opcodesxml_test.go b/internal/opcodesxml/opcodesxml_test.go index f3f8822..0f0f88e 100644 --- a/internal/opcodesxml/opcodesxml_test.go +++ b/internal/opcodesxml/opcodesxml_test.go @@ -1,8 +1,6 @@ package opcodesxml -import ( - "testing" -) +import "testing" func TestReadFile(t *testing.T) { _, err := ReadFile("testdata/x86_64.xml") diff --git a/operand/checks.go b/operand/checks.go index a05dda8..2585479 100644 --- a/operand/checks.go +++ b/operand/checks.go @@ -1,8 +1,6 @@ package operand -import ( - "github.com/mmcloughlin/avo/reg" -) +import "github.com/mmcloughlin/avo/reg" // Pure type assertion checks: diff --git a/operand/make_const.go b/operand/make_const.go index 21f9ab3..42262c7 100644 --- a/operand/make_const.go +++ b/operand/make_const.go @@ -15,9 +15,7 @@ import ( "strconv" ) -var ( - output = flag.String("output", "", "path to output file (default stdout)") -) +var output = flag.String("output", "", "path to output file (default stdout)") func PrintConstType(w io.Writer, name, typ, format string, size int, doc string) { r := typ[0] diff --git a/tests/cast/asm.go b/tests/cast/asm.go index 6985767..3ca65c9 100644 --- a/tests/cast/asm.go +++ b/tests/cast/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { TEXT("Split", NOSPLIT, "func(x uint64) (q uint64, l uint32, w uint16, b uint8)") diff --git a/tests/fixedbugs/issue50/asm.go b/tests/fixedbugs/issue50/asm.go index f571132..a7a5811 100644 --- a/tests/fixedbugs/issue50/asm.go +++ b/tests/fixedbugs/issue50/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { TEXT("Issue50", NOSPLIT, "func(x uint32) uint32") diff --git a/tests/fixedbugs/issue62/asm.go b/tests/fixedbugs/issue62/asm.go index c2a3e14..dd26b87 100644 --- a/tests/fixedbugs/issue62/asm.go +++ b/tests/fixedbugs/issue62/asm.go @@ -2,9 +2,7 @@ package main -import ( - . "github.com/mmcloughlin/avo/build" -) +import . "github.com/mmcloughlin/avo/build" func main() { Package("github.com/mmcloughlin/avo/tests/fixedbugs/issue62") diff --git a/tests/fixedbugs/issue62/issue62_test.go b/tests/fixedbugs/issue62/issue62_test.go index b550df1..4d8bfa2 100644 --- a/tests/fixedbugs/issue62/issue62_test.go +++ b/tests/fixedbugs/issue62/issue62_test.go @@ -1,8 +1,6 @@ package issue62 -import ( - "testing" -) +import "testing" //go:generate go run asm.go -out issue62.s