From 2951db0703f50c18a301b98df5b20c269fa97680 Mon Sep 17 00:00:00 2001 From: Joseph Richey Date: Fri, 2 Feb 2018 16:03:30 -0800 Subject: Change Golang formatter Moves from goimports to [goreturns](https://github.com/sqs/goreturns). This should not effect any code that already compiles as goreturns only adds zero return values, then runs goimports. This is mainly to help improve ergonomics when dealing with multiple return types. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a28522e..57c079e 100644 --- a/Makefile +++ b/Makefile @@ -130,8 +130,8 @@ update: # Format all the Go and C code .PHONY: format format-check format: - goimports -l -w $(GO_FILES) - clang-format -i -style=Google $(C_FILES) + @goreturns -l -w $(GO_FILES) + @clang-format -i -style=Google $(C_FILES) format-check: @goimports -d $(GO_FILES) \ @@ -170,7 +170,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 sourcegraph.com/sqs/goreturns go get -u honnef.co/go/tools/cmd/megacheck ##### Setup/Teardown for integration tests (need root permissions) ##### -- cgit v1.2.3