mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Update k8s.io/gengo/... dependency
This commit is contained in:
parent
26f00c66db
commit
54ad53fdb3
20
Godeps/Godeps.json
generated
20
Godeps/Godeps.json
generated
@ -2821,43 +2821,43 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/args",
|
"ImportPath": "k8s.io/gengo/args",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
|
"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
|
"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/examples/import-boss/generators",
|
"ImportPath": "k8s.io/gengo/examples/import-boss/generators",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/examples/set-gen/generators",
|
"ImportPath": "k8s.io/gengo/examples/set-gen/generators",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/examples/set-gen/sets",
|
"ImportPath": "k8s.io/gengo/examples/set-gen/sets",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/generator",
|
"ImportPath": "k8s.io/gengo/generator",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/namer",
|
"ImportPath": "k8s.io/gengo/namer",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/parser",
|
"ImportPath": "k8s.io/gengo/parser",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo/types",
|
"ImportPath": "k8s.io/gengo/types",
|
||||||
"Rev": "c118aa8edfff53fe5b69127a970f54b6cf3a7563"
|
"Rev": "4b7dfb7a2f42f66d9f5dfdf2c1557f409eac0869"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
|
"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
|
||||||
|
1
vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go
generated
vendored
1
vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go
generated
vendored
@ -459,6 +459,7 @@ func (g *genDeepCopy) GenerateType(c *generator.Context, t *types.Type, w io.Wri
|
|||||||
sw := generator.NewSnippetWriter(w, c, "$", "$")
|
sw := generator.NewSnippetWriter(w, c, "$", "$")
|
||||||
args := argsFromType(t).
|
args := argsFromType(t).
|
||||||
With("clonerType", types.Ref(conversionPackagePath, "Cloner"))
|
With("clonerType", types.Ref(conversionPackagePath, "Cloner"))
|
||||||
|
sw.Do("// $.type|dcFnName$ is an autogenerated deepcopy function.\n", args)
|
||||||
sw.Do("func $.type|dcFnName$(in interface{}, out interface{}, c *$.clonerType|raw$) error {{\n", args)
|
sw.Do("func $.type|dcFnName$(in interface{}, out interface{}, c *$.clonerType|raw$) error {{\n", args)
|
||||||
sw.Do("in := in.(*$.type|raw$)\nout := out.(*$.type|raw$)\n", argsFromType(t))
|
sw.Do("in := in.(*$.type|raw$)\nout := out.(*$.type|raw$)\n", argsFromType(t))
|
||||||
g.generateFor(t, sw)
|
g.generateFor(t, sw)
|
||||||
|
4
vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
generated
vendored
4
vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
generated
vendored
@ -422,6 +422,10 @@ func buildCallTreeForType(t *types.Type, root bool, existingDefaulters, newDefau
|
|||||||
parent.children = append(parent.children, *child)
|
parent.children = append(parent.children, *child)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
case types.Alias:
|
||||||
|
if child := buildCallTreeForType(t.Underlying, false, existingDefaulters, newDefaulters); child != nil {
|
||||||
|
parent.children = append(parent.children, *child)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(parent.children) == 0 && len(parent.call) == 0 {
|
if len(parent.children) == 0 && len(parent.call) == 0 {
|
||||||
//glog.V(6).Infof("decided type %s needs no generation", t.Name)
|
//glog.V(6).Infof("decided type %s needs no generation", t.Name)
|
||||||
|
2
vendor/k8s.io/gengo/generator/execute.go
generated
vendored
2
vendor/k8s.io/gengo/generator/execute.go
generated
vendored
@ -251,7 +251,7 @@ func (c *Context) ExecutePackage(outDir string, p Package) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if consts := g.PackageVars(genContext); len(consts) > 0 {
|
if consts := g.PackageConsts(genContext); len(consts) > 0 {
|
||||||
addIndentHeaderComment(&f.Consts, "Package-wide consts from generator %q.", g.Name())
|
addIndentHeaderComment(&f.Consts, "Package-wide consts from generator %q.", g.Name())
|
||||||
for _, v := range consts {
|
for _, v := range consts {
|
||||||
if _, err := fmt.Fprintf(&f.Consts, "%s\n", v); err != nil {
|
if _, err := fmt.Fprintf(&f.Consts, "%s\n", v); err != nil {
|
||||||
|
12
vendor/k8s.io/gengo/parser/parse.go
generated
vendored
12
vendor/k8s.io/gengo/parser/parse.go
generated
vendored
@ -342,9 +342,13 @@ func (b *Builder) importPackage(dir string, userRequested bool) (*tc.Package, er
|
|||||||
// and we can't miss pkgs that are only depended on.
|
// and we can't miss pkgs that are only depended on.
|
||||||
pkg, err := b.typeCheckPackage(pkgPath)
|
pkg, err := b.typeCheckPackage(pkgPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if ignoreError && pkg != nil {
|
switch {
|
||||||
glog.V(2).Infof("type checking encountered some errors in %q, but ignoring.\n", pkgPath)
|
case ignoreError && pkg != nil:
|
||||||
} else {
|
glog.V(2).Infof("type checking encountered some issues in %q, but ignoring.\n", pkgPath)
|
||||||
|
case !ignoreError && pkg != nil:
|
||||||
|
glog.V(2).Infof("type checking encountered some errors in %q\n", pkgPath)
|
||||||
|
return nil, err
|
||||||
|
default:
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -391,7 +395,7 @@ func (b *Builder) typeCheckPackage(pkgPath importPathString) (*tc.Package, error
|
|||||||
// method. So there can't be cycles in the import graph.
|
// method. So there can't be cycles in the import graph.
|
||||||
Importer: importAdapter{b},
|
Importer: importAdapter{b},
|
||||||
Error: func(err error) {
|
Error: func(err error) {
|
||||||
glog.V(2).Infof("type checker error: %v\n", err)
|
glog.V(2).Infof("type checker: %v\n", err)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
pkg, err := c.Check(string(pkgPath), b.fset, files, nil)
|
pkg, err := c.Check(string(pkgPath), b.fset, files, nil)
|
||||||
|
Loading…
Reference in New Issue
Block a user