aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/charithe/durationcheck/durationcheck.go
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2022-09-05 14:27:54 +0200
committerGitHub <noreply@github.com>2022-09-05 12:27:54 +0000
commitb2f2446b46bf02821d90ebedadae2bf7ae0e880e (patch)
tree923cf42842918d6bebca1d6bbdc08abed54d274d /vendor/github.com/charithe/durationcheck/durationcheck.go
parente6654faff4bcca4be92e9a8596fd4b77f747c39e (diff)
go.mod, vendor: update (#3358)
* go.mod, vendor: remove unnecessary dependencies Commands: 1. go mod tidy 2. go mod vendor * go.mod, vendor: update cloud.google.com/go Commands: 1. go get -u cloud.google.com/go 2. go mod tidy 3. go mod vendor * go.mod, vendor: update cloud.google.com/* Commands: 1. go get -u cloud.google.com/storage cloud.google.com/logging 2. go mod tidy 3. go mod vendor * go.mod, .golangci.yml, vendor: update *lint* Commands: 1. go get -u golang.org/x/tools github.com/golangci/golangci-lint@v1.47.0 2. go mod tidy 3. go mod vendor 4. edit .golangci.yml to suppress new errors (resolved in the same PR later) * all: fix lint errors hash.go: copy() recommended by gosimple parse.go: ent is never nil verifier.go: signal.Notify() with unbuffered channel is bad. Have no idea why. * .golangci.yml: adjust godot rules check-all is deprecated, but still work if you're hesitating too - I'll remove this commit
Diffstat (limited to 'vendor/github.com/charithe/durationcheck/durationcheck.go')
-rw-r--r--vendor/github.com/charithe/durationcheck/durationcheck.go25
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 {