github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Minor cleanups in conversion gen

Browse Source
This commit is contained in:
Tim Hockin
2016-09-25 10:17:16 -07:00
parent 17b64fc3d6
commit 87abf78bb7
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/libs/go2idl/conversion-gen/generators/conversion.go
View File

@@ -137,6 +137,7 @@ func getManualConversionFunctions(context *generator.Context, pkg *types.Package
continue continue
} }
// Now check if the name satisfies the convention. // Now check if the name satisfies the convention.
// TODO: This should call the Namer directly.
args := argsFromType(inType.Elem, outType.Elem) args := argsFromType(inType.Elem, outType.Elem)
sw.Do("Convert_$.inType|public$_To_$.outType|public$", args) sw.Do("Convert_$.inType|public$_To_$.outType|public$", args)
if f.Name.Name == buffer.String() { if f.Name.Name == buffer.String() {
@@ -210,11 +211,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
inputs := sets.NewString(context.Inputs...) inputs := sets.NewString(context.Inputs...)
packages := generator.Packages{} packages := generator.Packages{}
header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...) header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
header = append(header, []byte( header = append(header, []byte("\n// This file was autogenerated by conversion-gen. Do not edit it manually!\n\n")...)
`
// This file was autogenerated by conversion-gen. Do not edit it manually!
`)...)
// Accumulate pre-existing conversion and default functions. // Accumulate pre-existing conversion and default functions.
// TODO: This is too ad-hoc. We need a better way. // TODO: This is too ad-hoc. We need a better way.
@@ -290,10 +287,9 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
PackagePath: pkg.Path, PackagePath: pkg.Path,
HeaderText: header, HeaderText: header,
GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) { GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) {
generators = []generator.Generator{} return []generator.Generator{
generators = append( NewGenConversion(arguments.OutputFileBaseName, pkg.Path, manualConversions, manualDefaults, peerPkgs),
generators, NewGenConversion(arguments.OutputFileBaseName, pkg.Path, manualConversions, manualDefaults, peerPkgs)) }
return generators
}, },
FilterFunc: func(c *generator.Context, t *types.Type) bool { FilterFunc: func(c *generator.Context, t *types.Type) bool {
return t.Name.Package == pkg.Path return t.Name.Package == pkg.Path