fixup! feat!: Refactor request context

Author: stevehipwell

tools/extraneousnew/extraneousnew.go

@@ -196,8 +196,8 @@ func inspectBlock(pass *analysis.Pass, block *ast.BlockStmt) {
 			}
 
 			var targetArg ast.Expr
-			if fnName == "Do" && len(call.Args) == 3 {
-				targetArg = call.Args[2]
+			if fnName == "Do" && len(call.Args) == 2 {
+				targetArg = call.Args[1]
 			} else if fnName == "Decode" && len(call.Args) == 1 {
 				targetArg = call.Args[0]
 			}
@@ -251,8 +251,8 @@ func lookAhead(pass *analysis.Pass, block *ast.BlockStmt, startIndex int, lhsIde
 
 				fnName := getFunctionName(call.Fun)
 				var targetArg ast.Expr
-				if fnName == "Do" && len(call.Args) == 3 {
-					targetArg = call.Args[2]
+				if fnName == "Do" && len(call.Args) == 2 {
+					targetArg = call.Args[1]
 				} else if fnName == "Decode" && len(call.Args) == 1 {
 					targetArg = call.Args[0]
 				}

tools/extraneousnew/testdata/src/has-warnings/main.go

@@ -6,7 +6,6 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"testing"
@@ -18,7 +17,7 @@ type T struct {
 
 type Client struct{}
 
-func (c *Client) Do(ctx context.Context, req any, v any) (any, error) {
+func (c *Client) Do(req any, v any) (any, error) {
 	return nil, nil
 }
 
@@ -28,7 +27,7 @@ type Service struct {
 
 func assertNilError(t *testing.T, err error) {}
 
-func (s *Service) TestMethod(ctx context.Context, req any, r *http.Request, t *testing.T) {
+func (s *Service) TestMethod(req any, r *http.Request, t *testing.T) {
 	v1 := new(T)
 	s.client.Do(req, v1) // want "use 'var v1 [*]T' and pass '&v1' instead"
 

tools/extraneousnew/testdata/src/no-warnings/main.go

@@ -5,25 +5,21 @@
 
 package main
 
-import (
-	"context"
-)
-
 type T struct {
 	Field string
 }
 
 type Client struct{}
 
-func (c *Client) Do(ctx context.Context, req any, v any) (any, error) {
+func (c *Client) Do(req any, v any) (any, error) {
 	return nil, nil
 }
 
 type Receiver struct {
 	client *Client
 }
 
-func (s *Receiver) TestMethod(ctx context.Context, req any) {
+func (s *Receiver) TestMethod(req any) {
 	// Proper usage: var pointer and pass &v
 	var v1 *T
 	s.client.Do(req, &v1)
@@ -44,12 +40,12 @@ func (s *Receiver) TestMethod(ctx context.Context, req any) {
 	s.client.Do(req, &v11)
 }
 
-func (s *Receiver) MethodNameToIgnore(ctx context.Context, req any) {
+func (s *Receiver) MethodNameToIgnore(req any) {
 	v := new(T)
 	s.client.Do(req, v)
 }
 
-func (s *Receiver) unexportedMethod(ctx context.Context, req any) {
+func (s *Receiver) unexportedMethod(req any) {
 	v := new(T)
 	s.client.Do(req, v) // Should be ignored because unexported.
 }