From d3e6ba2741ed33bfa4c30cb15ccb0a0812731a49 Mon Sep 17 00:00:00 2001
From: Henry Clifford <h.a.clifford@gmail.com>
Date: Fri, 13 Apr 2018 14:39:00 -0400
Subject: [PATCH] update the template to declare the input args as a struct

---
 pkg/moq/template.go | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/pkg/moq/template.go b/pkg/moq/template.go
index 4d70827..ed6591e 100644
--- a/pkg/moq/template.go
+++ b/pkg/moq/template.go
@@ -46,26 +46,26 @@ type {{.InterfaceName}}Mock struct {
 	calls struct {
 {{- range .Methods }}
 		// {{ .Name }} holds details about calls to the {{.Name}} method.
-		{{ .Name }} []struct {
-			{{- range .Params }}
-			// {{ .Name | Exported }} is the {{ .Name }} argument value.
-			{{ .Name | Exported }} {{ .Type }}
-			{{- end }}
-		}
+		{{ .Name }} []{{.Name}}Call
 {{- end }}
 	}
 }
 {{ range .Methods }}
+
+// {{.Name}}Call represents the input arguments to {{.Name}}
+type {{.Name}}Call struct {
+	{{- range .Params }}
+	// {{ .Name | Exported }} is the {{ .Name }} argument value.
+	{{ .Name | Exported }} {{ .Type }}
+	{{- end }}
+}
+
 // {{.Name}} calls {{.Name}}Func.
 func (mock *{{$obj.InterfaceName}}Mock) {{.Name}}({{.Arglist}}) {{.ReturnArglist}} {
 	if mock.{{.Name}}Func == nil {
 		panic("moq: {{$obj.InterfaceName}}Mock.{{.Name}}Func is nil but {{$obj.InterfaceName}}.{{.Name}} was just called")
 	}
-	callInfo := struct {
-		{{- range .Params }}
-		{{ .Name | Exported }} {{ .Type }}
-		{{- end }}
-	}{
+	callInfo := {{.Name}}Call {
 		{{- range .Params }}
 		{{ .Name | Exported }}: {{ .Name }},
 		{{- end }}
@@ -83,20 +83,10 @@ func (mock *{{$obj.InterfaceName}}Mock) {{.Name}}({{.Arglist}}) {{.ReturnArglist
 // {{.Name}}Calls gets all the calls that were made to {{.Name}}.
 // Check the length with:
 //     len(mocked{{$obj.InterfaceName}}.{{.Name}}Calls())
-func (mock *{{$obj.InterfaceName}}Mock) {{.Name}}Calls() []struct {
-		{{- range .Params }}
-		{{ .Name | Exported }} {{ .Type }}
-		{{- end }}
-	} {
-	var calls []struct {
-		{{- range .Params }}
-		{{ .Name | Exported }} {{ .Type }}
-		{{- end }}
-	}
+func (mock *{{$obj.InterfaceName}}Mock) {{.Name}}Calls() []{{.Name}}Call {
 	lock{{$obj.InterfaceName}}Mock{{.Name}}.RLock()
-	calls = mock.calls.{{.Name}}
-	lock{{$obj.InterfaceName}}Mock{{.Name}}.RUnlock()
-	return calls
+	defer lock{{$obj.InterfaceName}}Mock{{.Name}}.RUnlock()
+	return mock.calls.{{.Name}}
 }
 {{ end -}}
 {{ end -}}`