github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 22:40:35 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Omit type names of emitted slice elements to appease gofmt"

Browse Source 
This reverts commit 243f47f3b3.

Not needed anymore, now that gengo calls 'gofmt -s'
This commit is contained in:
yongruilin
2025-10-01 19:30:27 +00:00
parent 5d067af5e1
commit 8105dbe5bc
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
staging/src/k8s.io/code-generator/cmd/validation-gen/validation.go
View File

@@ -1325,7 +1325,7 @@ func emitCallsToValidators(c *generator.Context, validations []validators.Functi
sw.Do("(ctx, op, fldPath, obj, oldObj", targs)
for _, arg := range v.Args {
sw.Do(", ", nil)
toGolangSourceDataLiteral(sw, emitterContext{Context: c}, arg)
toGolangSourceDataLiteral(sw, c, arg)
}
sw.Do(")", targs)
}
@@ -1406,7 +1406,7 @@ func (g *genValidations) emitValidationVariables(c *generator.Context, t *types.
}
sw.Do("var $.varName|private$ = ", targs)
toGolangSourceDataLiteral(sw, emitterContext{Context: c}, variable.Initializer)
toGolangSourceDataLiteral(sw, c, variable.Initializer)
sw.Do("\n", nil)
}
}
@@ -1420,13 +1420,7 @@ func (g *genValidations) emitValidationVariables(c *generator.Context, t *types.
}
}
type emitterContext struct {
*generator.Context
// True if the literal to be emitted is a slice or array element.
isElement bool
}
func toGolangSourceDataLiteral(sw *generator.SnippetWriter, c emitterContext, value any) {
func toGolangSourceDataLiteral(sw *generator.SnippetWriter, c *generator.Context, value any) {
// For safety, be strict in what values we output to visited source, and ensure strings
// are quoted.
@@ -1470,9 +1464,9 @@ func toGolangSourceDataLiteral(sw *generator.SnippetWriter, c emitterContext, va
// a "standard signature" validation function to wrap it.
targs := generator.Args{
"funcName": c.Universe.Type(v.Function.Function),
"field": mkSymbolArgs(c.Context, fieldPkgSymbols),
"operation": mkSymbolArgs(c.Context, operationPkgSymbols),
"context": mkSymbolArgs(c.Context, contextPkgSymbols),
"field": mkSymbolArgs(c, fieldPkgSymbols),
"operation": mkSymbolArgs(c, operationPkgSymbols),
"context": mkSymbolArgs(c, contextPkgSymbols),
"objType": v.ObjType,
"objTypePfx": "*",
}
@@ -1531,18 +1525,16 @@ func toGolangSourceDataLiteral(sw *generator.SnippetWriter, c emitterContext, va
targs := generator.Args{
"type": c.Universe.Type(v.Type),
}
if !c.isElement { // To conform to gofmt, omit type names for array/slice elements.
sw.Do("$.type|raw$", targs)
if len(v.TypeArgs) > 0 {
sw.Do("[", nil)
for i, typeArg := range v.TypeArgs {
if i > 0 {
sw.Do(", ", nil)
}
sw.Do("$.|raw$", typeArg)
sw.Do("$.type|raw$", targs)
if len(v.TypeArgs) > 0 {
sw.Do("[", nil)
for i, typeArg := range v.TypeArgs {
if i > 0 {
sw.Do(", ", nil)
}
sw.Do("]", nil)
sw.Do("$.|raw$", typeArg)
}
sw.Do("]", nil)
}
sw.Do("{\n", nil)
for _, f := range v.Fields {
@@ -1570,7 +1562,7 @@ func toGolangSourceDataLiteral(sw *generator.SnippetWriter, c emitterContext, va
}
sw.Do("{\n", nil)
for _, e := range v.Elements {
toGolangSourceDataLiteral(sw, emitterContext{Context: c.Context, isElement: true}, e)
toGolangSourceDataLiteral(sw, c, e)
sw.Do(",\n", nil)
}
sw.Do("}", nil)
@@ -1606,7 +1598,7 @@ func toGolangSourceDataLiteral(sw *generator.SnippetWriter, c emitterContext, va
}
}
func emitFunctionCall(sw *generator.SnippetWriter, c emitterContext, v validators.FunctionGen, leadingArgs ...string) {
func emitFunctionCall(sw *generator.SnippetWriter, c *generator.Context, v validators.FunctionGen, leadingArgs ...string) {
targs := generator.Args{
"funcName": c.Universe.Type(v.Function),
}