Skip to content

Commit 5157d6d

Browse files
thockink8s-publishing-bot
authored andcommitted
Non-pointer VariableGen
Kubernetes-commit: a758e725b865cae8318ceb5c2a1dcce92e7fc99b
1 parent 84220cb commit 5157d6d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

cmd/validation-gen/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ func (g *genValidations) emitValidationVariables(c *generator.Context, t *types.
12111211
tn := g.discovered.typeNodes[t]
12121212

12131213
variables := tn.typeValidations.Variables
1214-
slices.SortFunc(variables, func(a, b *validators.VariableGen) int {
1214+
slices.SortFunc(variables, func(a, b validators.VariableGen) int {
12151215
return cmp.Compare(a.Variable.Name, b.Variable.Name)
12161216
})
12171217
for _, variable := range variables {

cmd/validation-gen/validators/validators.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ type Validations struct {
232232

233233
// Variables holds any variables which must be generated to perform
234234
// validation. Variables are not permitted in every context.
235-
Variables []*VariableGen
235+
Variables []VariableGen
236236

237237
// Comments holds comments to emit (without the leanding "//").
238238
Comments []string
@@ -259,12 +259,12 @@ func (v *Validations) Len() int {
259259
return len(v.Functions) + len(v.Variables) + len(v.Comments)
260260
}
261261

262-
func (v *Validations) AddFunction(f FunctionGen) {
263-
v.Functions = append(v.Functions, f)
262+
func (v *Validations) AddFunction(fn FunctionGen) {
263+
v.Functions = append(v.Functions, fn)
264264
}
265265

266-
func (v *Validations) AddVariable(variable *VariableGen) {
267-
v.Variables = append(v.Variables, variable)
266+
func (v *Validations) AddVariable(vr VariableGen) {
267+
v.Variables = append(v.Variables, vr)
268268
}
269269

270270
func (v *Validations) AddComment(comment string) {
@@ -391,8 +391,8 @@ func (fg FunctionGen) WithComment(comment string) FunctionGen {
391391
}
392392

393393
// Variable creates a VariableGen for a given function name and extraArgs.
394-
func Variable(variable PrivateVar, initFunc FunctionGen) *VariableGen {
395-
return &VariableGen{
394+
func Variable(variable PrivateVar, initFunc FunctionGen) VariableGen {
395+
return VariableGen{
396396
Variable: variable,
397397
InitFunc: initFunc,
398398
}

0 commit comments

Comments
 (0)