diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go index a64bd255..a0d483f5 100644 --- a/mockgen/mockgen.go +++ b/mockgen/mockgen.go @@ -269,7 +269,7 @@ func (g *generator) Generate(pkg *model.Package, pkgName string, outputPackagePa } // Sort keys to make import alias generation predictable - sortedPaths := make([]string, len(im), len(im)) + sortedPaths := make([]string, len(im)) x := 0 for pth := range im { sortedPaths[x] = pth diff --git a/mockgen/parse.go b/mockgen/parse.go index d25e3ce5..1fe16c5e 100644 --- a/mockgen/parse.go +++ b/mockgen/parse.go @@ -250,9 +250,7 @@ func (p *fileParser) parseInterface(name, pkg string, it *ast.InterfaceType) (*m } // Copy the methods. // TODO: apply shadowing rules. - for _, m := range eintf.Methods { - intf.Methods = append(intf.Methods, m) - } + intf.Methods = append(intf.Methods, eintf.Methods...) case *ast.SelectorExpr: // Embedded interface in another package. fpkg, sel := v.X.(*ast.Ident).String(), v.Sel.String() @@ -278,9 +276,7 @@ func (p *fileParser) parseInterface(name, pkg string, it *ast.InterfaceType) (*m } // Copy the methods. // TODO: apply shadowing rules. - for _, m := range eintf.Methods { - intf.Methods = append(intf.Methods, m) - } + intf.Methods = append(intf.Methods, eintf.Methods...) default: return nil, fmt.Errorf("don't know how to mock method of type %T", field.Type) }