diff options
Diffstat (limited to 'vendor/github.com/charithe/durationcheck/durationcheck.go')
| -rw-r--r-- | vendor/github.com/charithe/durationcheck/durationcheck.go | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/vendor/github.com/charithe/durationcheck/durationcheck.go b/vendor/github.com/charithe/durationcheck/durationcheck.go index 6eccd9c2a..c47b3a761 100644 --- a/vendor/github.com/charithe/durationcheck/durationcheck.go +++ b/vendor/github.com/charithe/durationcheck/durationcheck.go @@ -76,7 +76,7 @@ func check(pass *analysis.Pass) func(ast.Node) { } func isDuration(x types.Type) bool { - return x.String() == "time.Duration" + return x.String() == "time.Duration" || x.String() == "*time.Duration" } // isUnacceptableExpr returns true if the argument is not an acceptable time.Duration expression @@ -94,9 +94,15 @@ func isUnacceptableExpr(pass *analysis.Pass, expr ast.Expr) bool { return !isAcceptableNestedExpr(pass, e) case *ast.SelectorExpr: return !isAcceptableNestedExpr(pass, e) + case *ast.StarExpr: + return !isAcceptableNestedExpr(pass, e) + case *ast.ParenExpr: + return !isAcceptableNestedExpr(pass, e) + case *ast.IndexExpr: + return !isAcceptableNestedExpr(pass, e) + default: + return true } - - return true } // isAcceptableCast returns true if the argument is an acceptable expression cast to time.Duration @@ -144,14 +150,23 @@ func isAcceptableNestedExpr(pass *analysis.Pass, n ast.Expr) bool { case *ast.Ident: return isAcceptableIdent(pass, e) case *ast.CallExpr: + if isAcceptableCast(pass, e) { + return true + } t := pass.TypesInfo.TypeOf(e) return !isDuration(t) case *ast.SelectorExpr: + return isAcceptableNestedExpr(pass, e.X) && isAcceptableIdent(pass, e.Sel) + case *ast.StarExpr: + return isAcceptableNestedExpr(pass, e.X) + case *ast.ParenExpr: + return isAcceptableNestedExpr(pass, e.X) + case *ast.IndexExpr: t := pass.TypesInfo.TypeOf(e) return !isDuration(t) + default: + return false } - - return false } func isAcceptableIdent(pass *analysis.Pass, ident *ast.Ident) bool { |