Adjust import paths for hashicorp/hcl2 repo

This begins 'the great fork' of zcl to HCL.

cmd/zclfmt/main.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-zcl/zclparse"
+	"github.com/hashicorp/hcl2/zclparse"
-	"github.com/zclconf/go-zcl/zclwrite"
+	"github.com/hashicorp/hcl2/zclwrite"
 	"golang.org/x/crypto/ssh/terminal"
 )
 

ext/include/file_resolver.go

@@ -4,8 +4,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-zcl/zclparse"
+	"github.com/hashicorp/hcl2/zclparse"
 )
 
 // FileResolver creates and returns a Resolver that interprets include paths

ext/include/map_resolver.go

@@ -3,7 +3,7 @@ package include
 import (
 	"fmt"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // MapResolver returns a Resolver that consults the given map for preloaded

ext/include/resolver.go

@@ -1,7 +1,7 @@
 package include
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // A Resolver maps an include path (an arbitrary string, but usually something

ext/include/transformer.go

@@ -1,9 +1,9 @@
 package include
 
 import (
-	"github.com/zclconf/go-zcl/ext/transform"
+	"github.com/hashicorp/hcl2/ext/transform"
-	"github.com/zclconf/go-zcl/gozcl"
+	"github.com/hashicorp/hcl2/gozcl"
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Transformer builds a transformer that finds any "include" blocks in a body

ext/include/transformer_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/gozcl"
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcltest"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/gozcl"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcltest"
 )
 
 func TestTransformer(t *testing.T) {

ext/transform/error.go

@@ -1,7 +1,7 @@
 package transform
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // NewErrorBody returns a zcl.Body that returns the given diagnostics whenever

ext/transform/transform.go

@@ -1,7 +1,7 @@
 package transform
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Shallow is equivalent to calling transformer.TransformBody(body), and

ext/transform/transform_test.go

@@ -5,9 +5,9 @@ import (
 
 	"reflect"
 
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcltest"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcltest"
 )
 
 // Assert that deepWrapper implements Body

ext/transform/transformer.go

@@ -1,7 +1,7 @@
 package transform
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // A Transformer takes a given body, applies some (possibly no-op)

ext/userfunc/decode.go

@@ -1,10 +1,10 @@
 package userfunc
 
 import (
+	"github.com/hashicorp/hcl2/gozcl"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
-	"github.com/zclconf/go-zcl/gozcl"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 var funcBodySchema = &zcl.BodySchema{

ext/userfunc/decode_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
 )
 
 func TestDecodeUserFunctions(t *testing.T) {

ext/userfunc/public.go

@@ -1,8 +1,8 @@
 package userfunc
 
 import (
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty/function"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // A ContextFunc is a callback used to produce the base EvalContext for

gozcl/decode.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty/convert"
 	"github.com/zclconf/go-cty/cty/gocty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // DecodeBody extracts the configuration within the given body into the given

gozcl/decode_test.go

@@ -6,10 +6,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
-	zclJSON "github.com/zclconf/go-zcl/zcl/json"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
+	zclJSON "github.com/hashicorp/hcl2/zcl/json"
+	"github.com/zclconf/go-cty/cty"
 )
 
 func TestDecodeBody(t *testing.T) {

gozcl/schema.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // ImpliedBodySchema produces a zcl.BodySchema derived from the type of the

gozcl/schema_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/zclconf/go-zcl/zcl"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func TestImpliedBodySchema(t *testing.T) {

gozcl/types.go

@@ -3,7 +3,7 @@ package gozcl
 import (
 	"reflect"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 var victimExpr zcl.Expression

zcl/hclhil/parser.go

@@ -3,9 +3,9 @@ package hclhil
 import (
 	"fmt"
 
-	"github.com/zclconf/go-zcl/zcl"
 	"github.com/hashicorp/hcl"
 	hclast "github.com/hashicorp/hcl/hcl/ast"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func parse(src []byte, filename string) (*zcl.File, zcl.Diagnostics) {

zcl/hclhil/public.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Parse attempts to parse the given buffer as HCL with HIL expressions and,

zcl/hclhil/shim.go

@@ -1,9 +1,9 @@
 package hclhil
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
 	hclparser "github.com/hashicorp/hcl/hcl/parser"
 	hcltoken "github.com/hashicorp/hcl/hcl/token"
+	"github.com/hashicorp/hcl2/zcl"
 	hilast "github.com/hashicorp/hil/ast"
 	hilparser "github.com/hashicorp/hil/parser"
 )

zcl/hclhil/structure.go

@@ -6,8 +6,8 @@ import (
 
 	hclast "github.com/hashicorp/hcl/hcl/ast"
 	hcltoken "github.com/hashicorp/hcl/hcl/token"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // body is our implementation of zcl.Body in terms of an HCL ObjectList

zcl/hclhil/structure_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	hclast "github.com/hashicorp/hcl/hcl/ast"
 	hcltoken "github.com/hashicorp/hcl/hcl/token"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestBodyPartialContent(t *testing.T) {

zcl/hclhil/template.go

@@ -5,11 +5,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-cty/cty/function"
-	"github.com/zclconf/go-zcl/zcl"
 	"github.com/hashicorp/hil"
 	hilast "github.com/hashicorp/hil/ast"
+	"github.com/zclconf/go-cty/cty"
+	"github.com/zclconf/go-cty/cty/function"
 )
 
 func parseTemplate(src []byte, filename string, startPos zcl.Pos) (zcl.Expression, zcl.Diagnostics) {

zcl/hclhil/template_test.go

@@ -3,10 +3,10 @@ package hclhil
 import (
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 	"github.com/zclconf/go-cty/cty/function/stdlib"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestTemplateExpression(t *testing.T) {

zcl/json/ast.go

@@ -3,7 +3,7 @@ package json
 import (
 	"math/big"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 type node interface {

zcl/json/parser.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func parseFileContent(buf []byte, filename string) (node, zcl.Diagnostics) {

zcl/json/parser_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/zclconf/go-zcl/zcl"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func TestParse(t *testing.T) {

zcl/json/public.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Parse attempts to parse the given buffer as JSON and, if successful, returns

zcl/json/public_test.go

@@ -3,8 +3,8 @@ package json
 import (
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestParse_nonObject(t *testing.T) {

zcl/json/scanner.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/apparentlymart/go-textseg/textseg"
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 //go:generate stringer -type tokenType scanner.go

zcl/json/scanner_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func TestScan(t *testing.T) {

zcl/json/structure.go

@@ -3,10 +3,10 @@ package json
 import (
 	"fmt"
 
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcl/hclhil"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcl/hclhil"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
 )
 
 // body is the implementation of "Body" used for files processed with the JSON

zcl/json/structure_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func TestBodyPartialContent(t *testing.T) {

zcl/zclsyntax/expression.go

@@ -3,10 +3,10 @@ package zclsyntax
 import (
 	"fmt"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 	"github.com/zclconf/go-cty/cty/function"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // Expression is the abstract type for nodes that behave as zcl expressions.

zcl/zclsyntax/expression_ops.go

@@ -3,11 +3,11 @@ package zclsyntax
 import (
 	"fmt"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 	"github.com/zclconf/go-cty/cty/function"
 	"github.com/zclconf/go-cty/cty/function/stdlib"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 type Operation struct {

zcl/zclsyntax/expression_template.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 type TemplateExpr struct {

zcl/zclsyntax/expression_template_test.go

@@ -3,8 +3,8 @@ package zclsyntax
 import (
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestTemplateExprParseAndValue(t *testing.T) {

zcl/zclsyntax/expression_test.go

@@ -3,10 +3,10 @@ package zclsyntax
 import (
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 	"github.com/zclconf/go-cty/cty/function/stdlib"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestExpressionParseAndValue(t *testing.T) {

zcl/zclsyntax/expression_vars.go

@@ -4,7 +4,7 @@ package zclsyntax
 // Run 'go generate' on this package to update the set of functions here.
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 func (e *AnonSymbolExpr) Variables() []zcl.Traversal {

zcl/zclsyntax/file.go

@@ -1,6 +1,6 @@
 package zclsyntax
 
-import "github.com/zclconf/go-zcl/zcl"
+import "github.com/hashicorp/hcl2/zcl"
 
 // File is the top-level object resulting from parsing a configuration file.
 type File struct {

zcl/zclsyntax/node.go

@@ -1,7 +1,7 @@
 package zclsyntax
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Node is the abstract type that every AST node implements.

zcl/zclsyntax/parse_traversal_test.go

@@ -6,8 +6,8 @@ import (
 	"reflect"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestParseTraversalAbs(t *testing.T) {

zcl/zclsyntax/parser.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 
 	"github.com/apparentlymart/go-textseg/textseg"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 type parser struct {

zcl/zclsyntax/parser_template.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"unicode"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func (p *parser) ParseTemplate() (Expression, zcl.Diagnostics) {

zcl/zclsyntax/parser_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestParseConfig(t *testing.T) {

zcl/zclsyntax/parser_traversal.go

@@ -1,8 +1,8 @@
 package zclsyntax
 
 import (
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // ParseTraversalAbs parses an absolute traversal that is assumed to consume

zcl/zclsyntax/peeker.go

@@ -1,7 +1,7 @@
 package zclsyntax
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 type peeker struct {

zcl/zclsyntax/public.go

@@ -1,7 +1,7 @@
 package zclsyntax
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // ParseConfig parses the given buffer as a whole zcl config file, returning

zcl/zclsyntax/scan_tokens.go

@@ -4,7 +4,7 @@ package zclsyntax
 import (
 	"bytes"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // This file is generated from scan_tokens.rl. DO NOT EDIT.

zcl/zclsyntax/scan_tokens_test.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestScanTokens_normal(t *testing.T) {

zcl/zclsyntax/structure.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // AsZCLBlock returns the block data expressed as a *zcl.Block.

zcl/zclsyntax/structure_test.go

@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestBodyContent(t *testing.T) {

zcl/zclsyntax/token.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/apparentlymart/go-textseg/textseg"
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Token represents a sequence of bytes from some zcl code that has been

zcl/zclsyntax/variables.go

@@ -1,7 +1,7 @@
 package zclsyntax
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Variables returns all of the variables referenced within a given experssion.

zcl/zclsyntax/variables_test.go

@@ -7,8 +7,8 @@ import (
 	"reflect"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func TestVariables(t *testing.T) {

zcl/zclsyntax/walk.go

@@ -1,7 +1,7 @@
 package zclsyntax
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // VisitFunc is the callback signature for VisitAll.

zcldec/decode.go

@@ -1,8 +1,8 @@
 package zcldec
 
 import (
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 func decode(body zcl.Body, block *zcl.Block, ctx *zcl.EvalContext, spec Spec, partial bool) (cty.Value, zcl.Body, zcl.Diagnostics) {

zcldec/public.go

@@ -1,8 +1,8 @@
 package zcldec
 
 import (
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // Decode interprets the given body using the given specification and returns

zcldec/public_test.go

@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
 )
 
 func TestDecode(t *testing.T) {

zcldec/schema.go

@@ -1,7 +1,7 @@
 package zcldec
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // ImpliedSchema returns the *zcl.BodySchema implied by the given specification.

zcldec/spec.go

@@ -3,9 +3,9 @@ package zcldec
 import (
 	"fmt"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // A Spec is a description of how to decode a zcl.Body to a cty.Value.

zcldec/variables.go

@@ -1,7 +1,7 @@
 package zcldec
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // Variables processes the given body with the given spec and returns a

zcldec/variables_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 func TestVariables(t *testing.T) {

zcled/navigation.go

@@ -1,7 +1,7 @@
 package zcled
 
 import (
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 type contextStringer interface {

zclparse/parser.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-zcl/zcl/hclhil"
+	"github.com/hashicorp/hcl2/zcl/hclhil"
-	"github.com/zclconf/go-zcl/zcl/json"
+	"github.com/hashicorp/hcl2/zcl/json"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 // NOTE: This is the public interface for parsing. The actual parsers are

zcltest/mock.go

@@ -3,8 +3,8 @@ package zcltest
 import (
 	"fmt"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 // MockBody returns a zcl.Body implementation that works in terms of a

zcltest/mock_test.go

@@ -5,8 +5,8 @@ import (
 
 	"reflect"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 var mockBodyIsBody zcl.Body = mockBody{}

zclwrite/ast.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"io"
 
+	"github.com/hashicorp/hcl2/zcl"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-zcl/zcl"
 )
 
 type Node interface {

zclwrite/ast_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 func TestBodyFindAttribute(t *testing.T) {

zclwrite/format.go

@@ -1,7 +1,7 @@
 package zclwrite
 
 import (
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 // placeholder token used when we don't have a token but we don't want

zclwrite/format_test.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 func TestFormat(t *testing.T) {

zclwrite/native_node_sorter.go

@@ -1,7 +1,7 @@
 package zclwrite
 
 import (
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 type nativeNodeSorter struct {

zclwrite/parser.go

@@ -3,8 +3,8 @@ package zclwrite
 import (
 	"sort"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 // Our "parser" here is actually not doing any parsing of its own. Instead,

zclwrite/parser_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
 )
 
 func TestParse(t *testing.T) {

zclwrite/public.go

@@ -3,7 +3,7 @@ package zclwrite
 import (
 	"bytes"
 
-	"github.com/zclconf/go-zcl/zcl"
+	"github.com/hashicorp/hcl2/zcl"
 )
 
 // ParseConfig interprets the given source bytes into a *zclwrite.File. The

zclwrite/round_trip_test.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/hashicorp/hcl2/zcl"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 	"github.com/zclconf/go-cty/cty/function/stdlib"
-	"github.com/zclconf/go-zcl/zcl"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
 )
 
 func TestRoundTripVerbatim(t *testing.T) {

zclwrite/tokens.go

@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"github.com/apparentlymart/go-textseg/textseg"
-	"github.com/zclconf/go-zcl/zcl/zclsyntax"
+	"github.com/hashicorp/hcl2/zcl/zclsyntax"
 )
 
 // TokenGen is an abstract type that can append tokens to a list. It is the