More revive lints

Signed-off-by: Steve Coffman <[email protected]>

.golangci.yml

@@ -32,14 +32,12 @@ linters-settings:
       - name: blank-imports
       - name: context-as-argument
       - name: context-keys-type
-      - name: dot-imports
       - name: error-return
       - name: error-naming
       - name: exported
         disabled: true
       - name: if-return
       - name: increment-decrement
-      - name: var-naming
       - name: var-declaration
       - name: package-comments
         disabled: true

graphql/handler/transport/websocket.go

@@ -193,7 +193,7 @@ func (c *wsConnection) init() bool {
 			}
 		}
 
-		var initAckPayload *InitPayload = nil
+		var initAckPayload *InitPayload
 		if c.InitFunc != nil {
 			var ctx context.Context
 			ctx, initAckPayload, err = c.InitFunc(c.ctx, c.initPayload)

internal/code/imports.go

@@ -102,21 +102,21 @@ func goModuleRoot(dir string) (string, bool) {
 			// go.mod is not found in the tree, so the same sentinel value fits all the directories in a tree
 			goModuleRootCache[d] = result
 		} else {
-			if relPath, err := filepath.Rel(result.goModPath, d); err != nil {
+			relPath, err := filepath.Rel(result.goModPath, d)
+			if err != nil {
 				panic(err)
-			} else {
-				path := result.moduleName
-				relPath := filepath.ToSlash(relPath)
-				if !strings.HasSuffix(relPath, "/") {
-					path += "/"
-				}
-				path += relPath
-
-				goModuleRootCache[d] = goModuleSearchResult{
-					path:       path,
-					goModPath:  result.goModPath,
-					moduleName: result.moduleName,
-				}
+			}
+			path := result.moduleName
+			relPath = filepath.ToSlash(relPath)
+			if !strings.HasSuffix(relPath, "/") {
+				path += "/"
+			}
+			path += relPath
+
+			goModuleRootCache[d] = goModuleSearchResult{
+				path:       path,
+				goModPath:  result.goModPath,
+				moduleName: result.moduleName,
 			}
 		}
 	}