Merge pull request #36 from philandstuff/release-v3.0.0

philandstuff · web-flow · commit e5ae7c988c56 · 2020-05-12T13:45:02.000+01:00
Release v3.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,33 @@
 # Changelog
 
 ## [Unreleased]
-[Unreleased]: https://github.com/philandstuff/dhall-golang/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/philandstuff/dhall-golang/compare/v3.0.0...HEAD
+
+## [3.0.0] - 2020-05-11
+[3.0.0]: https://github.com/philandstuff/dhall-golang/compare/v2.0.0...v3.0.0
+
+This brings dhall-golang up to version 16.0.0 of the Dhall standard.
+As the standard had breaking changes, this release is a major version
+bump.
+
+### Breaking changes
+
+ * Language changes:
+     * [Adjust precedence of `===` and `with`](https://github.com/dhall-lang/dhall-lang/pull/954)
+     * [Update encoding of floating point values to RFC7049bis](https://github.com/dhall-lang/dhall-lang/pull/958)
+
+### New features
+
+ * Language features:
+     * [Allow unions with mixed kinds](https://github.com/dhall-lang/dhall-lang/pull/957)
+
+### Bug fixes
+
+ * We now save fully-alpha-normalized expressions to the cache (#31)
+ * We now check the hash of expressions fetched from the cache (#32)
 
 ## [2.0.0] - 2020-04-17
-[1.0.0]: https://github.com/philandstuff/dhall-golang/compare/v1.0.0...v2.0.0
+[2.0.0]: https://github.com/philandstuff/dhall-golang/compare/v1.0.0...v2.0.0
 
 This brings dhall-golang up to version 15.0.0 of the Dhall standard.
 As the standard had breaking changes, this release is a major version
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/philandstuff/dhall-golang"
+	"github.com/philandstuff/dhall-golang/v3"
 )
 
 // 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/term"
+	. "github.com/philandstuff/dhall-golang/v3/term"
 )
 
 var nameToBuiltin = map[string]Term{
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/core"
+	"github.com/philandstuff/dhall-golang/v3/core"
 )
 
 // SemanticHash returns the semantic hash of an evaluated expression.
diff --git a/cmd/main.go b/cmd/main.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"os"
 
-	"github.com/philandstuff/dhall-golang/binary"
-	"github.com/philandstuff/dhall-golang/core"
-	"github.com/philandstuff/dhall-golang/imports"
-	"github.com/philandstuff/dhall-golang/parser"
+	"github.com/philandstuff/dhall-golang/v3/binary"
+	"github.com/philandstuff/dhall-golang/v3/core"
+	"github.com/philandstuff/dhall-golang/v3/imports"
+	"github.com/philandstuff/dhall-golang/v3/parser"
 )
 
 func main() {
diff --git a/core/ast.go b/core/ast.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/philandstuff/dhall-golang/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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/core"
-	"github.com/philandstuff/dhall-golang/parser"
+	"github.com/philandstuff/dhall-golang/v3/core"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/term"
 )
 
 // Ensure that alphaMatcher is a valid GomegaMatcher
diff --git a/core/eval.go b/core/eval.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/philandstuff/dhall-golang/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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/term"
+	"github.com/philandstuff/dhall-golang/v3/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"
+	"github.com/philandstuff/dhall-golang/v3"
 )
 
 // 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"
+	"github.com/philandstuff/dhall-golang/v3"
 )
 
 // 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"
+	"github.com/philandstuff/dhall-golang/v3"
 )
 
 // 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"
+	"github.com/philandstuff/dhall-golang/v3"
 )
 
 // 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
+module github.com/philandstuff/dhall-golang/v3
 
 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/binary"
-	"github.com/philandstuff/dhall-golang/term"
+	"github.com/philandstuff/dhall-golang/v3/binary"
+	"github.com/philandstuff/dhall-golang/v3/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/binary"
-	"github.com/philandstuff/dhall-golang/core"
-	"github.com/philandstuff/dhall-golang/parser"
-	"github.com/philandstuff/dhall-golang/term"
-	. "github.com/philandstuff/dhall-golang/term"
+	"github.com/philandstuff/dhall-golang/v3/binary"
+	"github.com/philandstuff/dhall-golang/v3/core"
+	"github.com/philandstuff/dhall-golang/v3/parser"
+	"github.com/philandstuff/dhall-golang/v3/term"
+	. "github.com/philandstuff/dhall-golang/v3/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/imports"
-	. "github.com/philandstuff/dhall-golang/internal"
-	. "github.com/philandstuff/dhall-golang/term"
+	. "github.com/philandstuff/dhall-golang/v3/imports"
+	. "github.com/philandstuff/dhall-golang/v3/internal"
+	. "github.com/philandstuff/dhall-golang/v3/term"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/internal/gubbins.go b/internal/gubbins.go
@@ -10,7 +10,7 @@ package internal
 import (
 	"net/url"
 
-	"github.com/philandstuff/dhall-golang/term"
+	"github.com/philandstuff/dhall-golang/v3/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
diff --git a/parser/internal/multiline.go b/parser/internal/multiline.go
diff --git a/parser/internal/multiline_test.go b/parser/internal/multiline_test.go
diff --git a/parser/parser.go b/parser/parser.go
diff --git a/parser/parser_test.go b/parser/parser_test.go
diff --git a/property_test.go b/property_test.go
diff --git a/regression_test.go b/regression_test.go
diff --git a/spec_test.go b/spec_test.go
diff --git a/term/fetchable_test.go b/term/fetchable_test.go
diff --git a/unmarshal.go b/unmarshal.go
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"`
	`21`	`+ "github.com/philandstuff/dhall-golang/v3"`
`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/term"`
	`11`	`+ . "github.com/philandstuff/dhall-golang/v3/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/core"`
	`7`	`+ "github.com/philandstuff/dhall-golang/v3/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
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"math"`
`6`	`6`
`7`		`- "github.com/philandstuff/dhall-golang/term"`
	`7`	`+ "github.com/philandstuff/dhall-golang/v3/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/term"`
	`7`	`+ "github.com/philandstuff/dhall-golang/v3/term"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func (naturalBuild) Call(x Value) Value {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`. "github.com/onsi/ginkgo/extensions/table"`
`6`	`6`	`. "github.com/onsi/gomega"`
`7`	`7`	`"github.com/onsi/gomega/types"`
`8`		`- "github.com/philandstuff/dhall-golang/term"`
	`8`	`+ "github.com/philandstuff/dhall-golang/v3/term"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// Ensure that alphaMatcher is a valid GomegaMatcher`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"sort"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/philandstuff/dhall-golang/term"`
	`9`	`+ "github.com/philandstuff/dhall-golang/v3/term"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type env map[string][]Value`