From 708abb8c9750d6555ca45d830c336ac1d9e7e465 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 11 Sep 2017 16:40:37 -0700 Subject: Move the zcl package and its two parsing subpackages to "hcl" names This is a super-invasive update since the "zcl" package in particular is referenced all over. There are probably still a few zcl references hanging around in comments, etc but this takes care of most of it. --- cmd/hclfmt/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/hclfmt/main.go b/cmd/hclfmt/main.go index 9e2c494..12f89b0 100644 --- a/cmd/hclfmt/main.go +++ b/cmd/hclfmt/main.go @@ -9,9 +9,9 @@ import ( "os" "strings" + "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hclparse" "github.com/hashicorp/hcl2/hclwrite" - "github.com/hashicorp/hcl2/zcl" "golang.org/x/crypto/ssh/terminal" ) @@ -25,7 +25,7 @@ var ( ) var parser = hclparse.NewParser() -var diagWr zcl.DiagnosticWriter // initialized in init +var diagWr hcl.DiagnosticWriter // initialized in init var checkErrs = false var changed []string @@ -35,7 +35,7 @@ func init() { if err != nil { w = 80 } - diagWr = zcl.NewDiagnosticTextWriter(os.Stderr, parser.Files(), uint(w), color) + diagWr = hcl.NewDiagnosticTextWriter(os.Stderr, parser.Files(), uint(w), color) } func main() { -- cgit v1.2.3