From 226a6ff197e3903f8dd7b39a5ae07c4948f20af2 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 9 Jul 2020 17:41:45 -0700 Subject: [PATCH] correctly map typegen to cbg in all cases We needed this to apply to maps, slices, etc. --- gen.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gen.go b/gen.go index 743f58e..d598228 100644 --- a/gen.go +++ b/gen.go @@ -69,14 +69,17 @@ func typeName(pkg string, t reflect.Type) string { case reflect.Map: return "map[" + typeName(pkg, t.Key()) + "]" + typeName(pkg, t.Elem()) default: - return strings.TrimPrefix(t.String(), pkg+".") + name := t.String() + if t.PkgPath() == "github.com/whyrusleeping/cbor-gen" { + name = "cbg." + strings.TrimPrefix(name, "typegen.") + } else { + name = strings.TrimPrefix(name, pkg+".") + } + return name } } func (f Field) TypeName() string { - if f.Type.PkgPath() == "github.com/whyrusleeping/cbor-gen" { - return "cbg" + strings.TrimPrefix(typeName(f.Pkg, f.Type), "typegen") - } return typeName(f.Pkg, f.Type) }