aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoseph Richey <joerichey94@gmail.com>2017-08-29 22:29:33 -0700
committerJoseph Richey <joerichey94@gmail.com>2017-08-29 22:29:33 -0700
commit8539c4c12ebdd6441f5d93fd499e31df2ed943c3 (patch)
treee0c80616666a3b9ca32a5d6869a7c01b90336063 /Makefile
parent83d4b499c505d3f5841fc0b0f8f29509622e870b (diff)
Go formatter "gofmt" -> "goimports"
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1ec009e..af1d4ab 100644
--- a/Makefile
+++ b/Makefile
@@ -129,11 +129,11 @@ update:
# Format all the Go and C code
.PHONY: format format-check
format:
- @gofmt -l -s -w $(GO_FILES)
+ @goimports -l -w $(GO_FILES)
@clang-format -i -style=Google $(C_FILES)
format-check:
- @gofmt -s -d $(GO_FILES) \
+ @goimports -d $(GO_FILES) \
| ./input_fail.py "Incorrectly formatted Go files. Run \"make format\"."
@clang-format -i -style=Google -output-replacements-xml $(C_FILES) \
| grep "<replacement " \
@@ -169,6 +169,7 @@ go-tools:
go get -u github.com/golang/protobuf/protoc-gen-go
go get -u github.com/golang/lint/golint
go get -u github.com/kardianos/govendor
+ go get -u golang.org/x/tools/cmd/goimports
go get -u honnef.co/go/tools/cmd/megacheck
##### Setup/Teardown for integration tests (need root permissions) #####