Merge pull request #56 from Trundle/update-to-v6

philandstuff · web-flow · commit ca8fd8a9dd73 · 2020-12-04T13:53:35.000Z
Update go.mod and imports to v6
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 )
 
 // Config can be a fairly arbitrary Go datatype.  You would put your
diff --git a/binary/cbor.go b/binary/cbor.go
@@ -8,7 +8,7 @@ import (
 	"path"
 
 	"github.com/fxamacker/cbor/v2"
-	. "github.com/philandstuff/dhall-golang/v5/term"
+	. "github.com/philandstuff/dhall-golang/v6/term"
 )
 
 var nameToBuiltin = map[string]Term{
diff --git a/binary/performance_test.go b/binary/performance_test.go
@@ -7,11 +7,11 @@ import (
 	"path"
 	"testing"
 
-	"github.com/philandstuff/dhall-golang/v5/binary"
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/imports"
-	"github.com/philandstuff/dhall-golang/v5/internal"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/binary"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/imports"
+	"github.com/philandstuff/dhall-golang/v6/internal"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 func BenchmarkDecodeLargeExpression(b *testing.B) {
diff --git a/binary/semantic_hash.go b/binary/semantic_hash.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"crypto/sha256"
 
-	"github.com/philandstuff/dhall-golang/v5/core"
+	"github.com/philandstuff/dhall-golang/v6/core"
 )
 
 // SemanticHash returns the semantic hash of an evaluated expression.
diff --git a/cmd/json.go b/cmd/json.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 	"github.com/urfave/cli/v2" // imports as package "cli"
 )
 
diff --git a/cmd/main.go b/cmd/main.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"os"
 
-	"github.com/philandstuff/dhall-golang/v5/binary"
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/imports"
-	"github.com/philandstuff/dhall-golang/v5/parser"
+	"github.com/philandstuff/dhall-golang/v6/binary"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/imports"
+	"github.com/philandstuff/dhall-golang/v6/parser"
 	"github.com/urfave/cli/v2" // imports as package "cli"
 )
 
diff --git a/cmd/yaml.go b/cmd/yaml.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 	"github.com/urfave/cli/v2" // imports as package "cli"
 	"gopkg.in/yaml.v2"
 )
diff --git a/core/ast.go b/core/ast.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // A Value is a Dhall value in beta-normal form.  You can think of
diff --git a/core/builtins.go b/core/builtins.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 func (naturalBuild) Call(x Value) Value {
diff --git a/core/builtins_test.go b/core/builtins_test.go
@@ -3,8 +3,8 @@ package core_test
 import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/parser"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/parser"
 )
 
 var _ = DescribeTable("ArgType of builtins", func(src, typ string) {
diff --git a/core/equivalence_test.go b/core/equivalence_test.go
@@ -5,7 +5,7 @@ import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/types"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // Ensure that alphaMatcher is a valid GomegaMatcher
diff --git a/core/eval.go b/core/eval.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 type env map[string][]Value
diff --git a/core/eval_test.go b/core/eval_test.go
@@ -3,7 +3,7 @@ package core
 import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 var _ = Describe("Eval", func() {
diff --git a/core/quote.go b/core/quote.go
@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // Quote takes the Value v and turns it back into a Term.
diff --git a/core/quote_test.go b/core/quote_test.go
@@ -3,7 +3,7 @@ package core
 import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 var _ = DescribeTable("Quote",
diff --git a/core/testing.go b/core/testing.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // GomegaMatcher is a copy of
diff --git a/core/typecheck.go b/core/typecheck.go
@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 type context map[string][]Value
diff --git a/core/typecheck_test.go b/core/typecheck_test.go
@@ -4,7 +4,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 var _ = DescribeTable("functionCheck",
diff --git a/example_function_test.go b/example_function_test.go
@@ -3,7 +3,7 @@ package dhall_test
 import (
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 )
 
 // Config is the struct we want to unmarshal from Dhall
diff --git a/example_nested_test.go b/example_nested_test.go
@@ -3,7 +3,7 @@ package dhall_test
 import (
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 )
 
 // NestedConfig is the struct we want to unmarshal from Dhall
diff --git a/example_tagged_test.go b/example_tagged_test.go
@@ -3,7 +3,7 @@ package dhall_test
 import (
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 )
 
 // TaggedMessage is the struct we want to unmarshal from Dhall
diff --git a/example_test.go b/example_test.go
@@ -3,7 +3,7 @@ package dhall_test
 import (
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5"
+	"github.com/philandstuff/dhall-golang/v6"
 )
 
 // Message is the struct we want to unmarshal from Dhall
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/philandstuff/dhall-golang/v5
+module github.com/philandstuff/dhall-golang/v6
 
 require (
 	github.com/fxamacker/cbor/v2 v2.2.1-0.20200511212021-28e39be4a84f
diff --git a/imports/cache.go b/imports/cache.go
@@ -10,8 +10,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/philandstuff/dhall-golang/v5/binary"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/binary"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // DhallCache is an interface for caching implementations.
diff --git a/imports/imports.go b/imports/imports.go
@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/philandstuff/dhall-golang/v5/binary"
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/parser"
-	"github.com/philandstuff/dhall-golang/v5/term"
-	. "github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/binary"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/parser"
+	"github.com/philandstuff/dhall-golang/v6/term"
+	. "github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // Load takes a Term and resolves all imports
diff --git a/imports/imports_test.go b/imports/imports_test.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"os"
 
-	. "github.com/philandstuff/dhall-golang/v5/imports"
-	. "github.com/philandstuff/dhall-golang/v5/internal"
-	. "github.com/philandstuff/dhall-golang/v5/term"
+	. "github.com/philandstuff/dhall-golang/v6/imports"
+	. "github.com/philandstuff/dhall-golang/v6/internal"
+	. "github.com/philandstuff/dhall-golang/v6/term"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/internal/gubbins.go b/internal/gubbins.go
@@ -10,7 +10,7 @@ package internal
 import (
 	"net/url"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 func NewImport(fetchable term.Fetchable, mode term.ImportMode) term.Import {
diff --git a/parser/internal/dhall.go b/parser/internal/dhall.go
diff --git a/parser/internal/dhall.peg b/parser/internal/dhall.peg
@@ -29,7 +29,7 @@ import (
 "unicode"
 "unicode/utf8"
 )
-import . "github.com/philandstuff/dhall-golang/v5/term"
+import . "github.com/philandstuff/dhall-golang/v6/term"
 
 // Helper function for parsing all the operator parsing blocks
 // see OrExpression for an example of how this is used
diff --git a/parser/internal/multiline.go b/parser/internal/multiline.go
@@ -3,7 +3,7 @@ package internal
 import (
 	"strings"
 
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 // removeLeadingCommonIndent removes the common leading indent from a
diff --git a/parser/internal/multiline_test.go b/parser/internal/multiline_test.go
@@ -1,7 +1,7 @@
 package internal
 
 import (
-	. "github.com/philandstuff/dhall-golang/v5/term"
+	. "github.com/philandstuff/dhall-golang/v6/term"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/parser/parser.go b/parser/parser.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"io"
 
-	"github.com/philandstuff/dhall-golang/v5/parser/internal"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/parser/internal"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 //go:generate pigeon -optimize-grammar -optimize-parser -o internal/dhall.go internal/dhall.peg
diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -3,9 +3,9 @@ package parser_test
 import (
 	"math"
 
-	. "github.com/philandstuff/dhall-golang/v5/internal"
-	"github.com/philandstuff/dhall-golang/v5/parser"
-	. "github.com/philandstuff/dhall-golang/v5/term"
+	. "github.com/philandstuff/dhall-golang/v6/internal"
+	"github.com/philandstuff/dhall-golang/v6/parser"
+	. "github.com/philandstuff/dhall-golang/v6/term"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/property_test.go b/property_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/leanovate/gopter/gen"
 	"github.com/leanovate/gopter/prop"
 
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/parser"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/parser"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 var (
diff --git a/regression_test.go b/regression_test.go
@@ -4,8 +4,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	. "github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/parser"
+	. "github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/parser"
 )
 
 func parseAndTypecheckTest(source string, expectedTypeSource string) {
diff --git a/spec_test.go b/spec_test.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/philandstuff/dhall-golang/v5/binary"
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/imports"
-	"github.com/philandstuff/dhall-golang/v5/parser"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/binary"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/imports"
+	"github.com/philandstuff/dhall-golang/v6/parser"
+	"github.com/philandstuff/dhall-golang/v6/term"
 	"github.com/pkg/errors"
 )
 
diff --git a/term/fetchable_test.go b/term/fetchable_test.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/philandstuff/dhall-golang/v5/internal"
-	. "github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/internal"
+	. "github.com/philandstuff/dhall-golang/v6/term"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/unmarshal.go b/unmarshal.go
@@ -6,10 +6,10 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/philandstuff/dhall-golang/v5/core"
-	"github.com/philandstuff/dhall-golang/v5/imports"
-	"github.com/philandstuff/dhall-golang/v5/parser"
-	"github.com/philandstuff/dhall-golang/v5/term"
+	"github.com/philandstuff/dhall-golang/v6/core"
+	"github.com/philandstuff/dhall-golang/v6/imports"
+	"github.com/philandstuff/dhall-golang/v6/parser"
+	"github.com/philandstuff/dhall-golang/v6/term"
 )
 
 func isMapEntryType(recordType map[string]core.Value) bool {
diff --git a/unmarshal_test.go b/unmarshal_test.go

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"fmt"`
`19`	`19`	`"io/ioutil"`
`20`	`20`
`21`		`- "github.com/philandstuff/dhall-golang/v5"`
	`21`	`+ "github.com/philandstuff/dhall-golang/v6"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// Config can be a fairly arbitrary Go datatype. You would put your`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"path"`
`9`	`9`
`10`	`10`	`"github.com/fxamacker/cbor/v2"`
`11`		`- . "github.com/philandstuff/dhall-golang/v5/term"`
	`11`	`+ . "github.com/philandstuff/dhall-golang/v6/term"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var nameToBuiltin = map[string]Term{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"crypto/sha256"`
`6`	`6`
`7`		`- "github.com/philandstuff/dhall-golang/v5/core"`
	`7`	`+ "github.com/philandstuff/dhall-golang/v6/core"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// SemanticHash returns the semantic hash of an evaluated expression.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"os"`
`7`	`7`
`8`		`- "github.com/philandstuff/dhall-golang/v5"`
	`8`	`+ "github.com/philandstuff/dhall-golang/v6"`
`9`	`9`	`"github.com/urfave/cli/v2" // imports as package "cli"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"math"`
`6`	`6`
`7`		`- "github.com/philandstuff/dhall-golang/v5/term"`
	`7`	`+ "github.com/philandstuff/dhall-golang/v6/term"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// A Value is a Dhall value in beta-normal form. You can think of`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"strings"`
`6`	`6`
`7`		`- "github.com/philandstuff/dhall-golang/v5/term"`
	`7`	`+ "github.com/philandstuff/dhall-golang/v6/term"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func (naturalBuild) Call(x Value) Value {`