Skip to content

K
k3s
Commit 140dfccd authored by Eric Tune's avatar Eric Tune
Browse files
Options

Merge pull request #18860 from erictune/fix-build

Fix build
parents 13ec258f 1965fe18
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 225 deletions
hack/verify-codecgen.sh
View file @ 140dfccd
......@@ -32,6 +32,7 @@ generated_files=($(
-o -wholename './target' \
-o -wholename '*/third_party/*' \
-o -wholename '*/Godeps/*' \
-o -wholename '*/testdata/*' \
\) -prune \
\) -name '*.generated.go'))
......
pkg/apis/extensions/types.generated.go
View file @ 140dfccd
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/apis/extensions/v1beta1/types.generated.go
View file @ 140dfccd
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/storage/testing/types.generated.go
View file @ 140dfccd
......@@ -156,30 +156,18 @@ func (x *TestResource) CodecEncodeSelf(e *codec1978.Encoder) {
if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yy10 := &x.ObjectMeta
yym11 := z.EncBinary()
_ = yym11
if false {
} else if z.HasExtensions() && z.EncExt(yy10) {
} else {
z.EncFallback(yy10)
}
yy10.CodecEncodeSelf(e)
} else {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy12 := &x.ObjectMeta
yym13 := z.EncBinary()
_ = yym13
if false {
} else if z.HasExtensions() && z.EncExt(yy12) {
} else {
z.EncFallback(yy12)
}
yy11 := &x.ObjectMeta
yy11.CodecEncodeSelf(e)
}
if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym15 := z.EncBinary()
_ = yym15
yym13 := z.EncBinary()
_ = yym13
if false {
} else {
r.EncodeInt(int64(x.Value))
......@@ -188,8 +176,8 @@ func (x *TestResource) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("value"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yym16 := z.EncBinary()
_ = yym16
yym14 := z.EncBinary()
_ = yym14
if false {
} else {
r.EncodeInt(int64(x.Value))
......@@ -208,25 +196,25 @@ func (x *TestResource) CodecDecodeSelf(d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
yym17 := z.DecBinary()
_ = yym17
yym15 := z.DecBinary()
_ = yym15
if false {
} else if z.HasExtensions() && z.DecExt(x) {
} else {
yyct18 := r.ContainerType()
if yyct18 == codecSelferValueTypeMap1234 {
yyl18 := r.ReadMapStart()
if yyl18 == 0 {
yyct16 := r.ContainerType()
if yyct16 == codecSelferValueTypeMap1234 {
yyl16 := r.ReadMapStart()
if yyl16 == 0 {
z.DecSendContainerState(codecSelfer_containerMapEnd1234)
} else {
x.codecDecodeSelfFromMap(yyl18, d)
x.codecDecodeSelfFromMap(yyl16, d)
}
} else if yyct18 == codecSelferValueTypeArray1234 {
yyl18 := r.ReadArrayStart()
if yyl18 == 0 {
} else if yyct16 == codecSelferValueTypeArray1234 {
yyl16 := r.ReadArrayStart()
if yyl16 == 0 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
} else {
x.codecDecodeSelfFromArray(yyl18, d)
x.codecDecodeSelfFromArray(yyl16, d)
}
} else {
panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234)
......@@ -238,12 +226,12 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yys19Slc = z.DecScratchBuffer() // default slice to decode into
_ = yys19Slc
var yyhl19 bool = l >= 0
for yyj19 := 0; ; yyj19++ {
if yyhl19 {
if yyj19 >= l {
var yys17Slc = z.DecScratchBuffer() // default slice to decode into
_ = yys17Slc
var yyhl17 bool = l >= 0
for yyj17 := 0; ; yyj17++ {
if yyhl17 {
if yyj17 >= l {
break
}
} else {
......@@ -252,10 +240,10 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
}
z.DecSendContainerState(codecSelfer_containerMapKey1234)
yys19Slc = r.DecodeBytes(yys19Slc, true, true)
yys19 := string(yys19Slc)
yys17Slc = r.DecodeBytes(yys17Slc, true, true)
yys17 := string(yys17Slc)
z.DecSendContainerState(codecSelfer_containerMapValue1234)
switch yys19 {
switch yys17 {
case "kind":
if r.TryDecodeAsNil() {
x.Kind = ""
......@@ -272,14 +260,8 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{}
} else {
yyv22 := &x.ObjectMeta
yym23 := z.DecBinary()
_ = yym23
if false {
} else if z.HasExtensions() && z.DecExt(yyv22) {
} else {
z.DecFallback(yyv22, false)
}
yyv20 := &x.ObjectMeta
yyv20.CodecDecodeSelf(d)
}
case "value":
if r.TryDecodeAsNil() {
......@@ -288,9 +270,9 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
x.Value = int(r.DecodeInt(codecSelferBitsize1234))
}
default:
z.DecStructFieldNotFound(-1, yys19)
} // end switch yys19
} // end for yyj19
z.DecStructFieldNotFound(-1, yys17)
} // end switch yys17
} // end for yyj17
z.DecSendContainerState(codecSelfer_containerMapEnd1234)
}
......@@ -298,16 +280,16 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj25 int
var yyb25 bool
var yyhl25 bool = l >= 0
yyj25++
if yyhl25 {
yyb25 = yyj25 > l
var yyj22 int
var yyb22 bool
var yyhl22 bool = l >= 0
yyj22++
if yyhl22 {
yyb22 = yyj22 > l
} else {
yyb25 = r.CheckBreak()
yyb22 = r.CheckBreak()
}
if yyb25 {
if yyb22 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
......@@ -317,13 +299,13 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} else {
x.Kind = string(r.DecodeString())
}
yyj25++
if yyhl25 {
yyb25 = yyj25 > l
yyj22++
if yyhl22 {
yyb22 = yyj22 > l
} else {
yyb25 = r.CheckBreak()
yyb22 = r.CheckBreak()
}
if yyb25 {
if yyb22 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
......@@ -333,13 +315,13 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} else {
x.APIVersion = string(r.DecodeString())
}
yyj25++
if yyhl25 {
yyb25 = yyj25 > l
yyj22++
if yyhl22 {
yyb22 = yyj22 > l
} else {
yyb25 = r.CheckBreak()
yyb22 = r.CheckBreak()
}
if yyb25 {
if yyb22 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
......@@ -347,22 +329,16 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{}
} else {
yyv28 := &x.ObjectMeta
yym29 := z.DecBinary()
_ = yym29
if false {
} else if z.HasExtensions() && z.DecExt(yyv28) {
} else {
z.DecFallback(yyv28, false)
}
yyv25 := &x.ObjectMeta
yyv25.CodecDecodeSelf(d)
}
yyj25++
if yyhl25 {
yyb25 = yyj25 > l
yyj22++
if yyhl22 {
yyb22 = yyj22 > l
} else {
yyb25 = r.CheckBreak()
yyb22 = r.CheckBreak()
}
if yyb25 {
if yyb22 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
......@@ -373,17 +349,17 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
x.Value = int(r.DecodeInt(codecSelferBitsize1234))
}
for {
yyj25++
if yyhl25 {
yyb25 = yyj25 > l
yyj22++
if yyhl22 {
yyb22 = yyj22 > l
} else {
yyb25 = r.CheckBreak()
yyb22 = r.CheckBreak()
}
if yyb25 {
if yyb22 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj25-1, "")
z.DecStructFieldNotFound(yyj22-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}
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