Commit 61e81e9a authored by supereagle's avatar supereagle

bump(k8s.io/gengo): 9e661e9308f078838e266cca1c673922088c0ea4

parent 3d3d3922
...@@ -384,7 +384,9 @@ func (g *genDeepCopy) legacyRegistration(c *generator.Context, w io.Writer) erro ...@@ -384,7 +384,9 @@ func (g *genDeepCopy) legacyRegistration(c *generator.Context, w io.Writer) erro
g.imports.AddType(cloner) g.imports.AddType(cloner)
if !g.registerTypes { if !g.registerTypes {
sw := generator.NewSnippetWriter(w, c, "$", "$") sw := generator.NewSnippetWriter(w, c, "$", "$")
sw.Do("// Deprecated: GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them.\n", nil) sw.Do("// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them.\n", nil)
sw.Do("//\n", nil)
sw.Do("// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.\n", nil)
sw.Do("func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc{\n", nil) sw.Do("func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc{\n", nil)
sw.Do("return []conversion.GeneratedDeepCopyFunc{\n", nil) sw.Do("return []conversion.GeneratedDeepCopyFunc{\n", nil)
for _, t := range g.typesForInit { for _, t := range g.typesForInit {
...@@ -398,7 +400,6 @@ func (g *genDeepCopy) legacyRegistration(c *generator.Context, w io.Writer) erro ...@@ -398,7 +400,6 @@ func (g *genDeepCopy) legacyRegistration(c *generator.Context, w io.Writer) erro
} }
sw := generator.NewSnippetWriter(w, c, "$", "$") sw := generator.NewSnippetWriter(w, c, "$", "$")
sw.Do("// Deprecated: register deep-copy functions.\n", nil)
sw.Do("func init() {\n", nil) sw.Do("func init() {\n", nil)
sw.Do("SchemeBuilder.Register(RegisterDeepCopies)\n", nil) sw.Do("SchemeBuilder.Register(RegisterDeepCopies)\n", nil)
sw.Do("}\n\n", nil) sw.Do("}\n\n", nil)
...@@ -408,8 +409,10 @@ func (g *genDeepCopy) legacyRegistration(c *generator.Context, w io.Writer) erro ...@@ -408,8 +409,10 @@ func (g *genDeepCopy) legacyRegistration(c *generator.Context, w io.Writer) erro
Kind: types.Pointer, Kind: types.Pointer,
Elem: scheme, Elem: scheme,
} }
sw.Do("// Deprecated: RegisterDeepCopies adds deep-copy functions to the given scheme. Public\n", nil) sw.Do("// RegisterDeepCopies adds deep-copy functions to the given scheme. Public\n", nil)
sw.Do("// to allow building arbitrary schemes.\n", nil) sw.Do("// to allow building arbitrary schemes.\n", nil)
sw.Do("//\n", nil)
sw.Do("// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.\n", nil)
sw.Do("func RegisterDeepCopies(scheme $.|raw$) error {\n", schemePtr) sw.Do("func RegisterDeepCopies(scheme $.|raw$) error {\n", schemePtr)
sw.Do("return scheme.AddGeneratedDeepCopyFuncs(\n", nil) sw.Do("return scheme.AddGeneratedDeepCopyFuncs(\n", nil)
for _, t := range g.typesForInit { for _, t := range g.typesForInit {
...@@ -565,11 +568,11 @@ func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Wri ...@@ -565,11 +568,11 @@ func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Wri
} }
if !foundDeepCopy { if !foundDeepCopy {
sw.Do("// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new $.type|raw$.\n", args) sw.Do("// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new $.type|raw$.\n", args)
sw.Do("func (x *$.type|raw$) DeepCopy() *$.type|raw$ {\n", args) sw.Do("func (in *$.type|raw$) DeepCopy() *$.type|raw$ {\n", args)
sw.Do("if x == nil { return nil }\n", nil) sw.Do("if in == nil { return nil }\n", nil)
sw.Do("out := new($.type|raw$)\n", args) sw.Do("out := new($.type|raw$)\n", args)
sw.Do("x.DeepCopyInto(out)\n", nil) sw.Do("in.DeepCopyInto(out)\n", nil)
sw.Do("return out\n", nil) sw.Do("return out\n", nil)
sw.Do("}\n\n", nil) sw.Do("}\n\n", nil)
} }
...@@ -581,12 +584,12 @@ func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Wri ...@@ -581,12 +584,12 @@ func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Wri
for _, intf := range intfs { for _, intf := range intfs {
sw.Do(fmt.Sprintf("// DeepCopy%s is an autogenerated deepcopy function, copying the receiver, creating a new $.type2|raw$.\n", intf.Name.Name), argsFromType(t, intf)) sw.Do(fmt.Sprintf("// DeepCopy%s is an autogenerated deepcopy function, copying the receiver, creating a new $.type2|raw$.\n", intf.Name.Name), argsFromType(t, intf))
if nonPointerReceiver { if nonPointerReceiver {
sw.Do(fmt.Sprintf("func (x $.type|raw$) DeepCopy%s() $.type2|raw$ {\n", intf.Name.Name), argsFromType(t, intf)) sw.Do(fmt.Sprintf("func (in $.type|raw$) DeepCopy%s() $.type2|raw$ {\n", intf.Name.Name), argsFromType(t, intf))
sw.Do("return *x.DeepCopy()", nil) sw.Do("return *in.DeepCopy()", nil)
sw.Do("}\n\n", nil) sw.Do("}\n\n", nil)
} else { } else {
sw.Do(fmt.Sprintf("func (x *$.type|raw$) DeepCopy%s() $.type2|raw$ {\n", intf.Name.Name), argsFromType(t, intf)) sw.Do(fmt.Sprintf("func (in *$.type|raw$) DeepCopy%s() $.type2|raw$ {\n", intf.Name.Name), argsFromType(t, intf))
sw.Do("if c := x.DeepCopy(); c != nil {\n", nil) sw.Do("if c := in.DeepCopy(); c != nil {\n", nil)
sw.Do("return c\n", nil) sw.Do("return c\n", nil)
sw.Do("} else {\n", nil) sw.Do("} else {\n", nil)
sw.Do("return nil\n", nil) sw.Do("return nil\n", nil)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment