review: remove closures

Author: ldez

analyzer.go

@@ -27,7 +27,7 @@ func NewAnalyzer(s Setting) *analysis.Analyzer {
 	return &analysis.Analyzer{
 		Name:     "recvcheck",
 		Doc:      "checks for receiver type consistency",
-		Run:      run(newFilter(excludeMethods)),
+		Run:      analyzer{excludeMethods: excludeMethods}.run,
 		Requires: []*analysis.Analyzer{inspect.Analyzer},
 	}
 }
@@ -45,70 +45,70 @@ type Setting struct {
 	DisableBuiltin bool
 }
 
-func run(filter func(*ast.FuncDecl) bool) func(*analysis.Pass) (any, error) {
-	return func(pass *analysis.Pass) (any, error) {
-		inspector := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector)
+type analyzer struct {
+	excludeMethods map[string]struct{}
+}
 
-		structs := map[string]*structType{}
-		inspector.Preorder([]ast.Node{(*ast.FuncDecl)(nil)}, func(n ast.Node) {
-			funcDecl, ok := n.(*ast.FuncDecl)
-			if !ok || funcDecl.Recv == nil || len(funcDecl.Recv.List) != 1 {
-				return
-			}
+func (r *analyzer) run(pass *analysis.Pass) (interface{}, error) {
+	inspector := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector)
 
-			if filter(funcDecl) {
-				return
-			}
+	structs := map[string]*structType{}
+	inspector.Preorder([]ast.Node{(*ast.FuncDecl)(nil)}, func(n ast.Node) {
+		funcDecl, ok := n.(*ast.FuncDecl)
+		if !ok || funcDecl.Recv == nil || len(funcDecl.Recv.List) != 1 {
+			return
+		}
 
-			var recv *ast.Ident
-			var isStar bool
-			switch recvType := funcDecl.Recv.List[0].Type.(type) {
-			case *ast.StarExpr:
-				isStar = true
-				if recv, ok = recvType.X.(*ast.Ident); !ok {
-					return
-				}
-			case *ast.Ident:
-				recv = recvType
-			default:
+		if r.isExcluded(funcDecl) {
+			return
+		}
+
+		var recv *ast.Ident
+		var isStar bool
+		switch recvType := funcDecl.Recv.List[0].Type.(type) {
+		case *ast.StarExpr:
+			isStar = true
+			if recv, ok = recvType.X.(*ast.Ident); !ok {
 				return
 			}
+		case *ast.Ident:
+			recv = recvType
+		default:
+			return
+		}
 
-			st, ok := structs[recv.Name]
-			if !ok {
-				structs[recv.Name] = &structType{}
-				st = structs[recv.Name]
-			}
+		st, ok := structs[recv.Name]
+		if !ok {
+			structs[recv.Name] = &structType{}
+			st = structs[recv.Name]
+		}
 
-			if isStar {
-				st.starUsed = true
-			} else {
-				st.typeUsed = true
-			}
-		})
+		if isStar {
+			st.starUsed = true
+		} else {
+			st.typeUsed = true
+		}
+	})
 
-		for recv, st := range structs {
-			if st.starUsed && st.typeUsed {
-				pass.Reportf(pass.Pkg.Scope().Lookup(recv).Pos(), "the methods of %q use pointer receiver and non-pointer receiver.", recv)
-			}
+	for recv, st := range structs {
+		if st.starUsed && st.typeUsed {
+			pass.Reportf(pass.Pkg.Scope().Lookup(recv).Pos(), "the methods of %q use pointer receiver and non-pointer receiver.", recv)
 		}
+	}
 
-		return nil, nil
+	return nil, nil
+}
+
+func (r *analyzer) isExcluded(f *ast.FuncDecl) bool {
+	if f.Name == nil || f.Name.Name == "" {
+		return true
 	}
+
+	_, found := r.excludeMethods[f.Name.Name]
+	return found
 }
 
 type structType struct {
 	starUsed bool
 	typeUsed bool
 }
-
-func newFilter(excludes map[string]struct{}) func(*ast.FuncDecl) bool {
-	return func(f *ast.FuncDecl) bool {
-		if f.Name == nil || f.Name.Name == "" {
-			return true
-		}
-
-		_, found := excludes[f.Name.Name]
-		return found
-	}
-}