From df85b62a7812783e539af4a6bd8a01996e0139c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9otime=20L=C3=A9v=C3=AAque?= Date: Sat, 5 Mar 2022 13:39:34 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20go-json=20generator.=20(#1?= =?UTF-8?q?806)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit go generate ./... generates panic as import paths have probably changed over time. This commit free this command from panics. --- internal/go-json/cmd/generator/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/go-json/cmd/generator/main.go b/internal/go-json/cmd/generator/main.go index 0712cd03b9..2041669e46 100644 --- a/internal/go-json/cmd/generator/main.go +++ b/internal/go-json/cmd/generator/main.go @@ -268,7 +268,7 @@ func (t OpType) FieldToOmitEmptyField() OpType { }); err != nil { return err } - path := filepath.Join(repoRoot(), "internal", "encoder", "optype.go") + path := filepath.Join(repoRoot(), "internal", "go-json", "encoder", "optype.go") buf, err := format.Source(b.Bytes()) if err != nil { return err @@ -290,7 +290,7 @@ func generateVM() error { f.Name.Name = pkg var buf bytes.Buffer printer.Fprint(&buf, fset, f) - path := filepath.Join(repoRoot(), "internal", "encoder", pkg, "vm.go") + path := filepath.Join(repoRoot(), "internal", "go-json", "encoder", pkg, "vm.go") source, err := format.Source(buf.Bytes()) if err != nil { return err @@ -304,7 +304,7 @@ func generateVM() error { func repoRoot() string { _, file, _, _ := runtime.Caller(0) - relativePathFromRepoRoot := filepath.Join("internal", "cmd", "generator") + relativePathFromRepoRoot := filepath.Join("internal", "go-json", "cmd", "generator") return strings.TrimSuffix(filepath.Dir(file), relativePathFromRepoRoot) }