chore: update to v0.3.3

ldez · ldez · commit 4bd8626b88cb · 2025-04-30T03:46:00.000+02:00
diff --git a/go.mod b/go.mod
@@ -100,7 +100,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.25.3
 	github.com/sirupsen/logrus v1.9.3
 	github.com/sivchari/containedctx v1.0.3
-	github.com/sonatard/noctx v0.3.2
+	github.com/sonatard/noctx v0.3.3
 	github.com/sourcegraph/go-diff v0.7.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
diff --git a/pkg/golinters/noctx/testdata/noctx.go b/pkg/golinters/noctx/testdata/noctx.go
@@ -23,7 +23,7 @@ func _() {
 	cli.Do(req2)
 
 	req3, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req3 = req3.WithContext(ctx)                          // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req3 = req3.WithContext(ctx)
 	cli.Do(req3)
 
 	f2 := func(req *http.Request, ctx context.Context) *http.Request {
@@ -33,15 +33,15 @@ func _() {
 	req4 = f2(req4, ctx)
 
 	req41, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req41 = req41.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req41 = req41.WithContext(ctx)
 	req41 = f2(req41, ctx)
 
 	newRequest := http.NewRequest
 	req5, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req5)
 
 	req51, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req51 = req51.WithContext(ctx)                    // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req51 = req51.WithContext(ctx)
 	cli.Do(req51)
 
 	req52, _ := newRequestPkg(http.MethodPost, url, nil) // TODO: false negative `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -55,7 +55,7 @@ func _() {
 	req6 = f3(req6, ctx)
 
 	req61, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req61 = req61.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req61 = req61.WithContext(ctx)
 	req61 = f3(req61, ctx)
 
 	type MyRequest2 http.Request
@@ -67,7 +67,7 @@ func _() {
 	f4(&req71, ctx)
 
 	req72, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req72 = req72.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req72 = req72.WithContext(ctx)
 	req73 := MyRequest2(*req7)
 	f4(&req73, ctx)
 
@@ -78,7 +78,7 @@ func _() {
 
 	req82, _ := func() (*http.Request, error) {
 		req82, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req82 = req82.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req82 = req82.WithContext(ctx)
 		return req82, nil
 	}()
 	cli.Do(req82)
@@ -90,7 +90,7 @@ func _() {
 	req9, _ = f5(req9, req9, ctx)
 
 	req91, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req91 = req91.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req91 = req91.WithContext(ctx)
 	req9, _ = f5(req91, req91, ctx)
 
 	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -99,7 +99,7 @@ func _() {
 
 	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req111, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req111 = req111.WithContext(ctx)                        // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req111 = req111.WithContext(ctx)
 	req101, req111 = f5(req101, req111, ctx)
 
 	func() (*http.Request, *http.Request) {
@@ -111,14 +111,14 @@ func _() {
 	func() (*http.Request, *http.Request) {
 		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 		req15, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req15 = req15.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req15 = req15.WithContext(ctx)
 
 		return req14, req15
 	}()
 
 	req121, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req121.AddCookie(&http.Cookie{Name: "k", Value: "v"})
-	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0)) // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0))
 	cli.Do(req121)
 }
 
diff --git a/pkg/golinters/noctx/testdata/noctx_cgo.go b/pkg/golinters/noctx/testdata/noctx_cgo.go
@@ -40,7 +40,7 @@ func _() {
 	cli.Do(req2)
 
 	req3, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req3 = req3.WithContext(ctx)                          // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req3 = req3.WithContext(ctx)
 	cli.Do(req3)
 
 	f2 := func(req *http.Request, ctx context.Context) *http.Request {
@@ -50,15 +50,15 @@ func _() {
 	req4 = f2(req4, ctx)
 
 	req41, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req41 = req41.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req41 = req41.WithContext(ctx)
 	req41 = f2(req41, ctx)
 
 	newRequest := http.NewRequest
 	req5, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req5)
 
 	req51, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req51 = req51.WithContext(ctx)                    // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req51 = req51.WithContext(ctx)
 	cli.Do(req51)
 
 	req52, _ := newRequestPkg(http.MethodPost, url, nil) // TODO: false negative `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -72,7 +72,7 @@ func _() {
 	req6 = f3(req6, ctx)
 
 	req61, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req61 = req61.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req61 = req61.WithContext(ctx)
 	req61 = f3(req61, ctx)
 
 	type MyRequest2 http.Request
@@ -84,7 +84,7 @@ func _() {
 	f4(&req71, ctx)
 
 	req72, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req72 = req72.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req72 = req72.WithContext(ctx)
 	req73 := MyRequest2(*req7)
 	f4(&req73, ctx)
 
@@ -95,7 +95,7 @@ func _() {
 
 	req82, _ := func() (*http.Request, error) {
 		req82, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req82 = req82.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req82 = req82.WithContext(ctx)
 		return req82, nil
 	}()
 	cli.Do(req82)
@@ -107,7 +107,7 @@ func _() {
 	req9, _ = f5(req9, req9, ctx)
 
 	req91, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req91 = req91.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req91 = req91.WithContext(ctx)
 	req9, _ = f5(req91, req91, ctx)
 
 	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -116,7 +116,7 @@ func _() {
 
 	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req111, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req111 = req111.WithContext(ctx)                        // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req111 = req111.WithContext(ctx)
 	req101, req111 = f5(req101, req111, ctx)
 
 	func() (*http.Request, *http.Request) {
@@ -128,14 +128,14 @@ func _() {
 	func() (*http.Request, *http.Request) {
 		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 		req15, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req15 = req15.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req15 = req15.WithContext(ctx)
 
 		return req14, req15
 	}()
 
 	req121, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req121.AddCookie(&http.Cookie{Name: "k", Value: "v"})
-	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0)) // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0))
 	cli.Do(req121)
 }
 
