Merge pull request #15 from Eric-Warehime/golang-1.17-upgrade

Golang 1.17 upgrade

Author: Eric-Warehime

.gitignore

@@ -9,3 +9,4 @@ msgp/cover.out
 *~
 *.coverprofile
 .idea/
+cover.out

Makefile

@@ -4,8 +4,6 @@
 # Installation can still be performed with a
 # normal `go install`.
 
-# generated integration test files
-GGEN = ./_generated/generated.go ./_generated/generated_test.go
 # generated unit test files
 MGEN = ./msgp/defgen_test.go
 
@@ -20,28 +18,25 @@ $(BIN): */*.go
 
 install: $(BIN)
 
-$(GGEN): ./_generated/def.go
-	go generate ./_generated
-
 $(MGEN): ./msgp/defs_test.go
 	go generate ./msgp
 
 test: all
-	go test ./... ./_generated
+	go test -covermode=atomic -coverprofile=cover.out ./...
 
 bench: all
 	go test -bench ./...
 
 clean:
-	$(RM) $(GGEN) $(MGEN)
+	$(RM) $(MGEN)
 
 wipe: clean
 	$(RM) $(BIN)
 
 get-deps:
 	go get -d -t ./...
 
-all: install $(GGEN) $(MGEN)
+all: install $(MGEN)
 
 # travis CI enters here
 travis:

go.mod

@@ -1,8 +1,13 @@
 module github.com/algorand/msgp
 
-go 1.16
+go 1.17
 
 require (
 	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31
 	golang.org/x/tools v0.0.0-20200423205358-59e73619c742
 )
+
+require (
+	golang.org/x/mod v0.2.0 // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
+)

printer/print.go

@@ -145,6 +145,6 @@ func writeImportHeader(b *bytes.Buffer, imports ...string) {
 }
 
 func writeBuildHeader(b *bytes.Buffer, buildHeaders []string) {
-	headers := fmt.Sprintf("// +build %s\n\n", strings.Join(buildHeaders, " "))
+	headers := fmt.Sprintf("//go:build %s\n// +build %s\n\n", strings.Join(buildHeaders, " "), strings.Join(buildHeaders, " "))
 	b.WriteString(headers)
 }

printer/print_test.go

@@ -0,0 +1,19 @@
+package printer
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestWriteBuildHeader(t *testing.T) {
+	testBuf := bytes.NewBuffer(make([]byte, 0, 4096))
+	buildHeaders := []string{"foobar"}
+	expectedBuf := bytes.NewBuffer(make([]byte, 0, 4096))
+	expectedBuf.WriteString("//go:build foobar\n// +build foobar\n\n")
+
+	writeBuildHeader(testBuf, buildHeaders)
+
+	if testBuf.String() != expectedBuf.String() {
+		t.Errorf("testBuf:\n%s not equal to expectedBuf:\n%s", testBuf, expectedBuf)
+	}
+}