Skip to content

Commit 913eaa1

Browse files
feedback
1 parent 9f4ff1f commit 913eaa1

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

github/gen-iterators.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -519,22 +519,17 @@ func (t *templateData) processReturnStarExpr(fd *ast.FuncDecl, starRet *ast.Star
519519
return
520520
}
521521

522-
var itemsField string
523-
var itemsType string
522+
var itemsField, itemsType string
524523

525524
if field, ok := sliceToBeUsedForIteration[methodInfo.RecvType+"."+fd.Name.Name]; ok {
526525
itemsField = field
527-
itemsType, ok = wrapperDef.Fields[itemsField]
528-
if !ok || !strings.HasPrefix(itemsType, "[]*") {
526+
if itemsType, ok = wrapperDef.Fields[itemsField]; !ok || !strings.HasPrefix(itemsType, "[]*") {
529527
logf("Skipping %v.%v: specified items field %v not found or not of type []*T in wrapper %v", methodInfo.RecvTypeRaw, fd.Name.Name, itemsField, wrapperType)
530528
return
531529
}
532-
} else {
533-
itemsField, itemsType, ok = findSinglePointerSliceField(wrapperDef)
534-
if !ok {
535-
logf("Skipping %v.%v: wrapper %v does not contain exactly one []*T field", methodInfo.RecvTypeRaw, fd.Name.Name, wrapperType)
536-
return
537-
}
530+
} else if itemsField, itemsType, ok = findSinglePointerSliceField(wrapperDef); !ok {
531+
logf("Skipping %v.%v: wrapper %v does not contain exactly one []*T field", methodInfo.RecvTypeRaw, fd.Name.Name, wrapperType)
532+
return
538533
}
539534

540535
testJSON, emptyReturnValue := "[]", "{}"

0 commit comments

Comments
 (0)