summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMartin Atkins <mart@degeneration.co.uk>2019-12-11 07:34:30 -0800
committerMartin Atkins <mart@degeneration.co.uk>2019-12-11 07:34:30 -0800
commita21a3f19084a904c7199362986973382abc2a4da (patch)
treeb68d58c3bc20799d56b14dd21797c196bcb525bb /cmd
parent051d00ef913346e8b9eec0f959f795f42b113995 (diff)
Fix import ordering from the move from hcl2 repository
When we did the automatic rewriting from the hashicorp/hcl2 import paths to hashicorp/hcl/v2 import paths, our automatic rewrite script did not run "go fmt" afterwards and so left some imports misordered as a result of the slightly-differently-shaped directory structure in the new repository.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/hcldec/spec.go2
-rw-r--r--cmd/hclspecsuite/test_file.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/hcldec/spec.go b/cmd/hcldec/spec.go
index a496ef6..b592cf9 100644
--- a/cmd/hcldec/spec.go
+++ b/cmd/hcldec/spec.go
@@ -3,9 +3,9 @@ package main
import (
"fmt"
+ "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/ext/userfunc"
"github.com/hashicorp/hcl/v2/gohcl"
- "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hcldec"
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/function"
diff --git a/cmd/hclspecsuite/test_file.go b/cmd/hclspecsuite/test_file.go
index 0b531d6..57ed35e 100644
--- a/cmd/hclspecsuite/test_file.go
+++ b/cmd/hclspecsuite/test_file.go
@@ -6,9 +6,9 @@ import (
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/convert"
+ "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/ext/typeexpr"
"github.com/hashicorp/hcl/v2/gohcl"
- "github.com/hashicorp/hcl/v2"
)
type TestFile struct {