github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

deep-copies: Structs cannot be nil

Browse Source
This commit is contained in:
kargakis 2015-09-24 17:16:39 +02:00
parent 8e25b7c7bf
commit ef36b3e4f6
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/deep_copy_generated.go
View File

@ -2267,8 +2267,6 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c
if in.Amount != nil { if in.Amount != nil {
if newVal, err := c.DeepCopy(in.Amount); err != nil { if newVal, err := c.DeepCopy(in.Amount); err != nil {
return err return err
} else if newVal == nil {
out.Amount = nil
} else { } else {
out.Amount = newVal.(*inf.Dec) out.Amount = newVal.(*inf.Dec)
} }

2
pkg/api/v1/deep_copy_generated.go
View File

@ -34,8 +34,6 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c
if in.Amount != nil { if in.Amount != nil {
if newVal, err := c.DeepCopy(in.Amount); err != nil { if newVal, err := c.DeepCopy(in.Amount); err != nil {
return err return err
} else if newVal == nil {
out.Amount = nil
} else { } else {
out.Amount = newVal.(*inf.Dec) out.Amount = newVal.(*inf.Dec)
} }

2
pkg/apis/extensions/deep_copy_generated.go
View File

@ -809,8 +809,6 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c
if in.Amount != nil { if in.Amount != nil {
if newVal, err := c.DeepCopy(in.Amount); err != nil { if newVal, err := c.DeepCopy(in.Amount); err != nil {
return err return err
} else if newVal == nil {
out.Amount = nil
} else { } else {
out.Amount = newVal.(*inf.Dec) out.Amount = newVal.(*inf.Dec)
} }

2
pkg/apis/extensions/v1beta1/deep_copy_generated.go
View File

@ -34,8 +34,6 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c
if in.Amount != nil { if in.Amount != nil {
if newVal, err := c.DeepCopy(in.Amount); err != nil { if newVal, err := c.DeepCopy(in.Amount); err != nil {
return err return err
} else if newVal == nil {
out.Amount = nil
} else { } else {
out.Amount = newVal.(*inf.Dec) out.Amount = newVal.(*inf.Dec)
} }

18
pkg/runtime/deep_copy_generator.go
View File

@ -403,7 +403,8 @@ func (g *deepCopyGenerator) writeDeepCopyForPtr(b *buffer, inField reflect.Struc
ifStmt := fmt.Sprintf(ifFormat, inField.Name) ifStmt := fmt.Sprintf(ifFormat, inField.Name)
b.addLine(ifStmt, indent) b.addLine(ifStmt, indent)
switch inField.Type.Elem().Kind() { kind := inField.Type.Elem().Kind()
switch kind {
case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct: case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct:
if _, found := g.copyables[inField.Type.Elem()]; found { if _, found := g.copyables[inField.Type.Elem()]; found {
newFormat := "out.%s = new(%s)\n" newFormat := "out.%s = new(%s)\n"
@ -420,8 +421,10 @@ func (g *deepCopyGenerator) writeDeepCopyForPtr(b *buffer, inField reflect.Struc
ifStmt := fmt.Sprintf(ifFormat, inField.Name) ifStmt := fmt.Sprintf(ifFormat, inField.Name)
b.addLine(ifStmt, indent+1) b.addLine(ifStmt, indent+1)
b.addLine("return err\n", indent+2) b.addLine("return err\n", indent+2)
b.addLine("} else if newVal == nil {\n", indent+1) if kind != reflect.Struct {
b.addLine(fmt.Sprintf("out.%s = nil\n", inField.Name), indent+2) b.addLine("} else if newVal == nil {\n", indent+1)
b.addLine(fmt.Sprintf("out.%s = nil\n", inField.Name), indent+2)
}
b.addLine("} else {\n", indent+1) b.addLine("} else {\n", indent+1)
assignFormat := "out.%s = newVal.(%s)\n" assignFormat := "out.%s = newVal.(%s)\n"
assignStmt := fmt.Sprintf(assignFormat, inField.Name, g.typeName(inField.Type)) assignStmt := fmt.Sprintf(assignFormat, inField.Name, g.typeName(inField.Type))
@ -455,7 +458,8 @@ func (g *deepCopyGenerator) writeDeepCopyForSlice(b *buffer, inField reflect.Str
forStmt := fmt.Sprintf(forFormat, inField.Name) forStmt := fmt.Sprintf(forFormat, inField.Name)
b.addLine(forStmt, indent+1) b.addLine(forStmt, indent+1)
switch inField.Type.Elem().Kind() { kind := inField.Type.Elem().Kind()
switch kind {
case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct: case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct:
if _, found := g.copyables[inField.Type.Elem()]; found { if _, found := g.copyables[inField.Type.Elem()]; found {
assignFormat := "if err := %s(in.%s[i], &out.%s[i], c); err != nil {\n" assignFormat := "if err := %s(in.%s[i], &out.%s[i], c); err != nil {\n"
@ -469,8 +473,10 @@ func (g *deepCopyGenerator) writeDeepCopyForSlice(b *buffer, inField reflect.Str
ifStmt := fmt.Sprintf(ifFormat, inField.Name) ifStmt := fmt.Sprintf(ifFormat, inField.Name)
b.addLine(ifStmt, indent+2) b.addLine(ifStmt, indent+2)
b.addLine("return err\n", indent+3) b.addLine("return err\n", indent+3)
b.addLine("} else if newVal == nil {\n", indent+2) if kind != reflect.Struct {
b.addLine(fmt.Sprintf("out.%s[i] = nil\n", inField.Name), indent+3) b.addLine("} else if newVal == nil {\n", indent+2)
b.addLine(fmt.Sprintf("out.%s[i] = nil\n", inField.Name), indent+3)
}
b.addLine("} else {\n", indent+2) b.addLine("} else {\n", indent+2)
assignFormat := "out.%s[i] = newVal.(%s)\n" assignFormat := "out.%s[i] = newVal.(%s)\n"
assignStmt := fmt.Sprintf(assignFormat, inField.Name, g.typeName(inField.Type.Elem())) assignStmt := fmt.Sprintf(assignFormat, inField.Name, g.typeName(inField.Type.Elem()))