Enable govet linter

superfly · Aug 11, 2022 · 3fa00a4 · 3fa00a4
1 parent 0882d4d
commit 3fa00a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -32,7 +32,7 @@ linters:
     # - errcheck
     - goimports
     - gosimple
-    # - govet
+    - govet
     # - ineffassign
     # - staticcheck
     - unconvert

diff --git a/internal/command/ping/ping.go b/internal/command/ping/ping.go
@@ -140,6 +140,7 @@ func run(ctx context.Context) error {
 	mu.Unlock()
 
 	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
 
 	if name != "" && name != "gateway" && !strings.HasPrefix(name, "fdaa:") {
 		// look up names in the background because I was too
@@ -275,7 +276,6 @@ func run(ctx context.Context) error {
 	for i := 0; count == 0 || i <= count; i++ {
 		select {
 		case <-stp:
-			cancel()
 			return nil
 		case <-ticker.C:
 		}
@@ -289,8 +289,6 @@ func run(ctx context.Context) error {
 		}
 	}
 
-	cancel()
-
 	return nil
 }