From 6c4344623b6ac528a57f9b80e4622acfab2fde40 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 9 Sep 2019 16:08:19 -0700 Subject: 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. --- ext/typeexpr/get_type.go | 2 +- ext/typeexpr/get_type_test.go | 6 +++--- ext/typeexpr/public.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/typeexpr') 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" ) -- cgit v1.2.3