Unfold the "hcl" directory up into the root

The main HCL package is more visible this way, and so it's easier than
having to pick it out from dozens of other package directories.

26 files changed, 31 insertions, 31 deletions

diff --git a/ext/dynblock/expand_body.go b/ext/dynblock/expand_body.go
index cf83637..65a9eab 100644
--- a/ext/dynblock/expand_body.go
+++ b/ext/dynblock/expand_body.go
@@ -3,7 +3,7 @@ package dynblock
 import (
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/dynblock/expand_body_test.go b/ext/dynblock/expand_body_test.go
index 074600b..207a2b6 100644
--- a/ext/dynblock/expand_body_test.go
+++ b/ext/dynblock/expand_body_test.go
@@ -3,7 +3,7 @@ package dynblock
 import (
 	"testing"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/hcl/v2/hcltest"
 	"github.com/zclconf/go-cty/cty"
diff --git a/ext/dynblock/expand_spec.go b/ext/dynblock/expand_spec.go
index e64a6e3..98a51ea 100644
--- a/ext/dynblock/expand_spec.go
+++ b/ext/dynblock/expand_spec.go
@@ -3,7 +3,7 @@ package dynblock
 import (
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 )
diff --git a/ext/dynblock/expr_wrap.go b/ext/dynblock/expr_wrap.go
index 250fb45..460a1d2 100644
--- a/ext/dynblock/expr_wrap.go
+++ b/ext/dynblock/expr_wrap.go
@@ -1,7 +1,7 @@
 package dynblock
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/dynblock/iteration.go b/ext/dynblock/iteration.go
index 0967659..c566388 100644
--- a/ext/dynblock/iteration.go
+++ b/ext/dynblock/iteration.go
@@ -1,7 +1,7 @@
 package dynblock
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/dynblock/public.go b/ext/dynblock/public.go
index 7ae7085..f4c55c8 100644
--- a/ext/dynblock/public.go
+++ b/ext/dynblock/public.go
@@ -1,7 +1,7 @@
 package dynblock
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // Expand "dynamic" blocks in the given body, returning a new body that
diff --git a/ext/dynblock/schema.go b/ext/dynblock/schema.go
index 77d6044..b3907d6 100644
--- a/ext/dynblock/schema.go
+++ b/ext/dynblock/schema.go
@@ -1,6 +1,6 @@
 package dynblock
 
-import "github.com/hashicorp/hcl/v2/hcl"
+import "github.com/hashicorp/hcl/v2"
 
 var dynamicBlockHeaderSchema = hcl.BlockHeaderSchema{
 	Type:       "dynamic",
diff --git a/ext/dynblock/unknown_body.go b/ext/dynblock/unknown_body.go
index 2addbc6..ce98259 100644
--- a/ext/dynblock/unknown_body.go
+++ b/ext/dynblock/unknown_body.go
@@ -1,7 +1,7 @@
 package dynblock
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/dynblock/variables.go b/ext/dynblock/variables.go
index 658c478..1923392 100644
--- a/ext/dynblock/variables.go
+++ b/ext/dynblock/variables.go
@@ -1,7 +1,7 @@
 package dynblock
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/dynblock/variables_hcldec.go b/ext/dynblock/variables_hcldec.go
index ec3588f..907ef3e 100644
--- a/ext/dynblock/variables_hcldec.go
+++ b/ext/dynblock/variables_hcldec.go
@@ -1,7 +1,7 @@
 package dynblock
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hcldec"
 )
 
diff --git a/ext/dynblock/variables_test.go b/ext/dynblock/variables_test.go
index 209737a..b3a2d72 100644
--- a/ext/dynblock/variables_test.go
+++ b/ext/dynblock/variables_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 func TestVariables(t *testing.T) {
diff --git a/ext/include/file_resolver.go b/ext/include/file_resolver.go
index 382c6d4..11091b8 100644
--- a/ext/include/file_resolver.go
+++ b/ext/include/file_resolver.go
@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclparse"
 )
 
diff --git a/ext/include/map_resolver.go b/ext/include/map_resolver.go
index b1da3df..452a6d8 100644
--- a/ext/include/map_resolver.go
+++ b/ext/include/map_resolver.go
@@ -3,7 +3,7 @@ package include
 import (
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // MapResolver returns a Resolver that consults the given map for preloaded
diff --git a/ext/include/resolver.go b/ext/include/resolver.go
index b1c957a..38c8b73 100644
--- a/ext/include/resolver.go
+++ b/ext/include/resolver.go
@@ -1,7 +1,7 @@
 package include
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // A Resolver maps an include path (an arbitrary string, but usually something
diff --git a/ext/include/transformer.go b/ext/include/transformer.go
index a76e7f6..ae0a808 100644
--- a/ext/include/transformer.go
+++ b/ext/include/transformer.go
@@ -3,7 +3,7 @@ package include
 import (
 	"github.com/hashicorp/hcl/v2/ext/transform"
 	"github.com/hashicorp/hcl/v2/gohcl"
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // Transformer builds a transformer that finds any "include" blocks in a body
diff --git a/ext/include/transformer_test.go b/ext/include/transformer_test.go
index 71d7a2f..e5d6c1a 100644
--- a/ext/include/transformer_test.go
+++ b/ext/include/transformer_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/hashicorp/hcl/v2/gohcl"
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hcltest"
 	"github.com/zclconf/go-cty/cty"
 )
diff --git a/ext/transform/error.go b/ext/transform/error.go
index f35c304..6063e2b 100644
--- a/ext/transform/error.go
+++ b/ext/transform/error.go
@@ -1,7 +1,7 @@
 package transform
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // NewErrorBody returns a hcl.Body that returns the given diagnostics whenever
diff --git a/ext/transform/transform.go b/ext/transform/transform.go
index ad99b8d..f0f5ff6 100644
--- a/ext/transform/transform.go
+++ b/ext/transform/transform.go
@@ -1,7 +1,7 @@
 package transform
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // Shallow is equivalent to calling transformer.TransformBody(body), and
diff --git a/ext/transform/transform_test.go b/ext/transform/transform_test.go
index 07a09ef..7b68aca 100644
--- a/ext/transform/transform_test.go
+++ b/ext/transform/transform_test.go
@@ -5,7 +5,7 @@ import (
 
 	"reflect"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hcltest"
 	"github.com/zclconf/go-cty/cty"
 )
diff --git a/ext/transform/transformer.go b/ext/transform/transformer.go
index 2950926..2599cdd 100644
--- a/ext/transform/transformer.go
+++ b/ext/transform/transformer.go
@@ -1,7 +1,7 @@
 package transform
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // A Transformer takes a given body, applies some (possibly no-op)
diff --git a/ext/typeexpr/get_type.go b/ext/typeexpr/get_type.go
index 581288b..11b0689 100644
--- a/ext/typeexpr/get_type.go
+++ b/ext/typeexpr/get_type.go
@@ -3,7 +3,7 @@ package typeexpr
 import (
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/typeexpr/get_type_test.go b/ext/typeexpr/get_type_test.go
index bb40c24..391bf4f 100644
--- a/ext/typeexpr/get_type_test.go
+++ b/ext/typeexpr/get_type_test.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/gohcl"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
-	"github.com/hashicorp/hcl/v2/hcl/json"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
+	"github.com/hashicorp/hcl/v2/json"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/typeexpr/public.go b/ext/typeexpr/public.go
index 0deedcb..3b8f618 100644
--- a/ext/typeexpr/public.go
+++ b/ext/typeexpr/public.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/userfunc/decode.go b/ext/userfunc/decode.go
index 73f4336..6c1e4ca 100644
--- a/ext/userfunc/decode.go
+++ b/ext/userfunc/decode.go
@@ -1,7 +1,7 @@
 package userfunc
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 )
diff --git a/ext/userfunc/decode_test.go b/ext/userfunc/decode_test.go
index d22abb8..633c6d8 100644
--- a/ext/userfunc/decode_test.go
+++ b/ext/userfunc/decode_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/ext/userfunc/public.go b/ext/userfunc/public.go
index 626a18c..5415c8c 100644
--- a/ext/userfunc/public.go
+++ b/ext/userfunc/public.go
@@ -1,7 +1,7 @@
 package userfunc
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty/function"
 )