mirror of
				https://github.com/mgechev/revive.git
				synced 2025-10-30 23:37:49 +02:00 
			
		
		
		
	Fix linter warnings (recommended config) in the code (#71)
This commit is contained in:
		| @@ -18,7 +18,7 @@ func (f *Default) Name() string { | |||||||
| } | } | ||||||
|  |  | ||||||
| // Format formats the failures gotten from the lint. | // Format formats the failures gotten from the lint. | ||||||
| func (f *Default) Format(failures <-chan lint.Failure, config lint.RulesConfig) (string, error) { | func (f *Default) Format(failures <-chan lint.Failure, _ lint.RulesConfig) (string, error) { | ||||||
| 	for failure := range failures { | 	for failure := range failures { | ||||||
| 		fmt.Printf("%v: %s\n", failure.Position.Start, failure.Failure) | 		fmt.Printf("%v: %s\n", failure.Position.Start, failure.Failure) | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ func (f *Unix) Name() string { | |||||||
| } | } | ||||||
|  |  | ||||||
| // Format formats the failures gotten from the lint. | // Format formats the failures gotten from the lint. | ||||||
| func (f *Unix) Format(failures <-chan lint.Failure, config lint.RulesConfig) (string, error) { | func (f *Unix) Format(failures <-chan lint.Failure, _ lint.RulesConfig) (string, error) { | ||||||
| 	for failure := range failures { | 	for failure := range failures { | ||||||
| 		fmt.Printf("%v: [%s] %s\n", failure.Position.Start, failure.RuleName, failure.Failure) | 		fmt.Printf("%v: [%s] %s\n", failure.Position.Start, failure.RuleName, failure.Failure) | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type BlankImportsRule struct{} | type BlankImportsRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *BlankImportsRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *BlankImportsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
| @@ -38,7 +38,7 @@ type lintBlankImports struct { | |||||||
| 	onFailure func(lint.Failure) | 	onFailure func(lint.Failure) | ||||||
| } | } | ||||||
|  |  | ||||||
| func (w lintBlankImports) Visit(n ast.Node) ast.Visitor { | func (w lintBlankImports) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	// In package main and in tests, we don't complain about blank imports. | 	// In package main and in tests, we don't complain about blank imports. | ||||||
| 	if w.file.Pkg.IsMain() || w.file.IsTest() { | 	if w.file.Pkg.IsMain() || w.file.IsTest() { | ||||||
| 		return nil | 		return nil | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type BoolLiteralRule struct{} | type BoolLiteralRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *BoolLiteralRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *BoolLiteralRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -49,7 +49,7 @@ var allPkgs = packages{pkgs: make([]pkgMethods, 1)} | |||||||
| type ConfusingNamingRule struct{} | type ConfusingNamingRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ConfusingNamingRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ConfusingNamingRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
| 	pkgm := allPkgs.methodNames(file.Pkg) | 	pkgm := allPkgs.methodNames(file.Pkg) | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type ConfusingResultsRule struct{} | type ConfusingResultsRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ConfusingResultsRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ConfusingResultsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
| @@ -59,9 +59,9 @@ func (w lintConfusingResults) Visit(n ast.Node) ast.Visitor { | |||||||
| 				Failure:    "unnamed results of the same type may be confusing, consider using named results", | 				Failure:    "unnamed results of the same type may be confusing, consider using named results", | ||||||
| 			}) | 			}) | ||||||
| 			break | 			break | ||||||
| 		} else { |  | ||||||
| 			lastType = t.Name |  | ||||||
| 		} | 		} | ||||||
|  | 		lastType = t.Name | ||||||
|  |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	return w | 	return w | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import ( | |||||||
| type ConstantLogicalExprRule struct{} | type ConstantLogicalExprRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ConstantLogicalExprRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ConstantLogicalExprRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type ContextAsArgumentRule struct{} | type ContextAsArgumentRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ContextAsArgumentRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ContextAsArgumentRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type ContextKeysType struct{} | type ContextKeysType struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ContextKeysType) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ContextKeysType) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ type lintCyclomatic struct { | |||||||
| 	onFailure  func(lint.Failure) | 	onFailure  func(lint.Failure) | ||||||
| } | } | ||||||
|  |  | ||||||
| func (w lintCyclomatic) Visit(n ast.Node) ast.Visitor { | func (w lintCyclomatic) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	f := w.file | 	f := w.file | ||||||
| 	for _, decl := range f.AST.Decls { | 	for _, decl := range f.AST.Decls { | ||||||
| 		if fn, ok := decl.(*ast.FuncDecl); ok { | 		if fn, ok := decl.(*ast.FuncDecl); ok { | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type DeepExitRule struct{} | type DeepExitRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *DeepExitRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *DeepExitRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
| 		failures = append(failures, failure) | 		failures = append(failures, failure) | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type DotImportsRule struct{} | type DotImportsRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *DotImportsRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *DotImportsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
| @@ -38,7 +38,7 @@ type lintImports struct { | |||||||
| 	onFailure func(lint.Failure) | 	onFailure func(lint.Failure) | ||||||
| } | } | ||||||
|  |  | ||||||
| func (w lintImports) Visit(n ast.Node) ast.Visitor { | func (w lintImports) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	for i, is := range w.fileAst.Imports { | 	for i, is := range w.fileAst.Imports { | ||||||
| 		_ = i | 		_ = i | ||||||
| 		if is.Name != nil && is.Name.Name == "." && !w.file.IsTest() { | 		if is.Name != nil && is.Name.Name == "." && !w.file.IsTest() { | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type EmptyBlockRule struct{} | type EmptyBlockRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *EmptyBlockRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *EmptyBlockRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import ( | |||||||
| type ErrorNamingRule struct{} | type ErrorNamingRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ErrorNamingRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ErrorNamingRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
| @@ -41,7 +41,7 @@ type lintErrors struct { | |||||||
| 	onFailure func(lint.Failure) | 	onFailure func(lint.Failure) | ||||||
| } | } | ||||||
|  |  | ||||||
| func (w lintErrors) Visit(n ast.Node) ast.Visitor { | func (w lintErrors) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	for _, decl := range w.fileAst.Decls { | 	for _, decl := range w.fileAst.Decls { | ||||||
| 		gd, ok := decl.(*ast.GenDecl) | 		gd, ok := decl.(*ast.GenDecl) | ||||||
| 		if !ok || gd.Tok != token.VAR { | 		if !ok || gd.Tok != token.VAR { | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type ErrorReturnRule struct{} | type ErrorReturnRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ErrorReturnRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ErrorReturnRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ import ( | |||||||
| type ErrorStringsRule struct{} | type ErrorStringsRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ErrorStringsRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ErrorStringsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import ( | |||||||
| type ErrorfRule struct{} | type ErrorfRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ErrorfRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ErrorfRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ import ( | |||||||
| type ExportedRule struct{} | type ExportedRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ExportedRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ExportedRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	if isTest(file) { | 	if isTest(file) { | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ type lintFileHeader struct { | |||||||
| 	onFailure func(lint.Failure) | 	onFailure func(lint.Failure) | ||||||
| } | } | ||||||
|  |  | ||||||
| func (w lintFileHeader) Visit(n ast.Node) ast.Visitor { | func (w lintFileHeader) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	g := w.fileAst.Comments[0] | 	g := w.fileAst.Comments[0] | ||||||
| 	failure := lint.Failure{ | 	failure := lint.Failure{ | ||||||
| 		Node:       w.fileAst, | 		Node:       w.fileAst, | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type FlagParamRule struct{} | type FlagParamRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *FlagParamRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *FlagParamRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type GetReturnRule struct{} | type GetReturnRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *GetReturnRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *GetReturnRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type IfReturnRule struct{} | type IfReturnRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *IfReturnRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *IfReturnRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -54,7 +54,7 @@ type blacklistedImports struct { | |||||||
| 	blacklist map[string]bool | 	blacklist map[string]bool | ||||||
| } | } | ||||||
|  |  | ||||||
| func (w blacklistedImports) Visit(n ast.Node) ast.Visitor { | func (w blacklistedImports) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	for _, is := range w.fileAst.Imports { | 	for _, is := range w.fileAst.Imports { | ||||||
| 		if is.Path != nil && !w.file.IsTest() && w.blacklist[is.Path.Value] { | 		if is.Path != nil && !w.file.IsTest() && w.blacklist[is.Path.Value] { | ||||||
| 			w.onFailure(lint.Failure{ | 			w.onFailure(lint.Failure{ | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type IncrementDecrementRule struct{} | type IncrementDecrementRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *IncrementDecrementRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *IncrementDecrementRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type IndentErrorFlowRule struct{} | type IndentErrorFlowRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *IndentErrorFlowRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *IndentErrorFlowRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
| @@ -77,4 +77,3 @@ func (w lintElse) Visit(node ast.Node) ast.Visitor { | |||||||
| 	} | 	} | ||||||
| 	return w | 	return w | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type ModifiesParamRule struct{} | type ModifiesParamRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ModifiesParamRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ModifiesParamRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -124,7 +124,7 @@ func (w lintModifiesValRecRule) skipType(t ast.Expr) bool { | |||||||
| 	return strings.HasPrefix(rtName, "[]") || strings.HasPrefix(rtName, "map[") | 	return strings.HasPrefix(rtName, "[]") || strings.HasPrefix(rtName, "map[") | ||||||
| } | } | ||||||
|  |  | ||||||
| func (_ lintModifiesValRecRule) getNameFromExpr(ie ast.Expr) string { | func (lintModifiesValRecRule) getNameFromExpr(ie ast.Expr) string { | ||||||
| 	ident, ok := ie.(*ast.Ident) | 	ident, ok := ie.(*ast.Ident) | ||||||
| 	if !ok { | 	if !ok { | ||||||
| 		return "" | 		return "" | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ import ( | |||||||
| type PackageCommentsRule struct{} | type PackageCommentsRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *PackageCommentsRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *PackageCommentsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	if isTest(file) { | 	if isTest(file) { | ||||||
| @@ -45,7 +45,7 @@ type lintPackageComments struct { | |||||||
| 	onFailure func(lint.Failure) | 	onFailure func(lint.Failure) | ||||||
| } | } | ||||||
|  |  | ||||||
| func (l *lintPackageComments) Visit(n ast.Node) ast.Visitor { | func (l *lintPackageComments) Visit(_ ast.Node) ast.Visitor { | ||||||
| 	if l.file.IsTest() { | 	if l.file.IsTest() { | ||||||
| 		return nil | 		return nil | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type RangeRule struct{} | type RangeRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *RangeRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *RangeRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type ReceiverNamingRule struct{} | type ReceiverNamingRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *ReceiverNamingRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *ReceiverNamingRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type RedefinesBuiltinIDRule struct{} | type RedefinesBuiltinIDRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *RedefinesBuiltinIDRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *RedefinesBuiltinIDRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	var builtInConstAndVars = map[string]bool{ | 	var builtInConstAndVars = map[string]bool{ | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type SuperfluousElseRule struct{} | type SuperfluousElseRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *SuperfluousElseRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *SuperfluousElseRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
| 		failures = append(failures, failure) | 		failures = append(failures, failure) | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import ( | |||||||
| type TimeNamingRule struct{} | type TimeNamingRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *TimeNamingRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *TimeNamingRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
| @@ -50,7 +50,7 @@ func (w *lintTimeNames) Visit(node ast.Node) ast.Visitor { | |||||||
| 		if pt, ok := typ.(*types.Pointer); ok { | 		if pt, ok := typ.(*types.Pointer); ok { | ||||||
| 			typ = pt.Elem() | 			typ = pt.Elem() | ||||||
| 		} | 		} | ||||||
| 		if !isNamedType(w.file.Pkg, typ, "time", "Duration") { | 		if !isNamedType(typ, "time", "Duration") { | ||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
| 		suffix := "" | 		suffix := "" | ||||||
| @@ -83,7 +83,7 @@ var timeSuffixes = []string{ | |||||||
| 	"MS", "Ms", | 	"MS", "Ms", | ||||||
| } | } | ||||||
|  |  | ||||||
| func isNamedType(p *lint.Package, typ types.Type, importPath, name string) bool { | func isNamedType(typ types.Type, importPath, name string) bool { | ||||||
| 	n, ok := typ.(*types.Named) | 	n, ok := typ.(*types.Named) | ||||||
| 	if !ok { | 	if !ok { | ||||||
| 		return false | 		return false | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import ( | |||||||
| type UnexportedReturnRule struct{} | type UnexportedReturnRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *UnexportedReturnRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *UnexportedReturnRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ import ( | |||||||
| type UnnecessaryStmtRule struct{} | type UnnecessaryStmtRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *UnnecessaryStmtRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *UnnecessaryStmtRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
| 		failures = append(failures, failure) | 		failures = append(failures, failure) | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import ( | |||||||
| type UnreachableCodeRule struct{} | type UnreachableCodeRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *UnreachableCodeRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *UnreachableCodeRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
| 	onFailure := func(failure lint.Failure) { | 	onFailure := func(failure lint.Failure) { | ||||||
| 		failures = append(failures, failure) | 		failures = append(failures, failure) | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import ( | |||||||
| type VarDeclarationsRule struct{} | type VarDeclarationsRule struct{} | ||||||
|  |  | ||||||
| // Apply applies the rule to given file. | // Apply applies the rule to given file. | ||||||
| func (r *VarDeclarationsRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure { | func (r *VarDeclarationsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { | ||||||
| 	var failures []lint.Failure | 	var failures []lint.Failure | ||||||
|  |  | ||||||
| 	fileAst := file.AST | 	fileAst := file.AST | ||||||
|   | |||||||
| @@ -35,13 +35,13 @@ func testRule(t *testing.T, filename string, rule lint.Rule, config ...*lint.Rul | |||||||
| 		c[rule.Name()] = *config[0] | 		c[rule.Name()] = *config[0] | ||||||
| 	} | 	} | ||||||
| 	if parseInstructions(t, filename, src) == nil { | 	if parseInstructions(t, filename, src) == nil { | ||||||
| 		assertSuccess(t, baseDir, stat, src, []lint.Rule{rule}, c) | 		assertSuccess(t, baseDir, stat, []lint.Rule{rule}, c) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 	assertFailures(t, baseDir, stat, src, []lint.Rule{rule}, c) | 	assertFailures(t, baseDir, stat, src, []lint.Rule{rule}, c) | ||||||
| } | } | ||||||
|  |  | ||||||
| func assertSuccess(t *testing.T, baseDir string, fi os.FileInfo, src []byte, rules []lint.Rule, config map[string]lint.RuleConfig) error { | func assertSuccess(t *testing.T, baseDir string, fi os.FileInfo, rules []lint.Rule, config map[string]lint.RuleConfig) error { | ||||||
| 	l := lint.New(func(file string) ([]byte, error) { | 	l := lint.New(func(file string) ([]byte, error) { | ||||||
| 		return ioutil.ReadFile(baseDir + file) | 		return ioutil.ReadFile(baseDir + file) | ||||||
| 	}) | 	}) | ||||||
| @@ -220,7 +220,8 @@ func srcLine(src []byte, p token.Position) string { | |||||||
| 	return string(src[lo:hi]) | 	return string(src[lo:hi]) | ||||||
| } | } | ||||||
|  |  | ||||||
| func TestLine(t *testing.T) { | // TestLine tests srcLine function | ||||||
|  | func TestLine(t *testing.T) { //revive:disable-line:exported | ||||||
| 	tests := []struct { | 	tests := []struct { | ||||||
| 		src    string | 		src    string | ||||||
| 		offset int | 		offset int | ||||||
| @@ -242,7 +243,8 @@ func TestLine(t *testing.T) { | |||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| func TestLintName(t *testing.T) { | // TestLintName tests lint.Name function | ||||||
|  | func TestLintName(t *testing.T) { //revive:disable-line:exported | ||||||
| 	tests := []struct { | 	tests := []struct { | ||||||
| 		name, want string | 		name, want string | ||||||
| 	}{ | 	}{ | ||||||
| @@ -301,7 +303,8 @@ func exportedType(typ types.Type) bool { | |||||||
| 	return true | 	return true | ||||||
| } | } | ||||||
|  |  | ||||||
| func TestExportedType(t *testing.T) { | // TestExportedType tests exportedType function | ||||||
|  | func TestExportedType(t *testing.T) { //revive:disable-line:exported | ||||||
| 	tests := []struct { | 	tests := []struct { | ||||||
| 		typString string | 		typString string | ||||||
| 		exp       bool | 		exp       bool | ||||||
| @@ -356,7 +359,8 @@ func isGenerated(src []byte) bool { | |||||||
| 	return false | 	return false | ||||||
| } | } | ||||||
|  |  | ||||||
| func TestIsGenerated(t *testing.T) { | // TestIsGenerated tests isGenerated function | ||||||
|  | func TestIsGenerated(t *testing.T) { //revive:disable-line:exported | ||||||
| 	tests := []struct { | 	tests := []struct { | ||||||
| 		source    string | 		source    string | ||||||
| 		generated bool | 		generated bool | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user