Fix remaining lint issues

anacrolix · anacrolix · commit 1641c4542c3f · 2026-02-26T13:38:20.000+11:00
- pex_test: copy pexState fields individually to avoid copying sync.RWMutex
- fuse errors: add nolint pragmas for deprecated fuse error types
- Replace deprecated VerifyData with VerifyDataContext(context.TODO())
- Replace deprecated math/rand.Read with math/rand/v2.ChaCha8.Read
- Convert if-else chain to tagged switch in file-io-mmap
- Add nolint for intentionally empty branches with comments
- Add nolint for table.addIndex (generics false positive, implements tableInterface)
- Fix unusedresult in ut-holepunch test, ineffassign in requesting test
- Remove redundant type annotation in torrent.go
diff --git a/client_test.go b/client_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"math/rand"
+	rand "math/rand/v2"
 	"net"
 	"net/netip"
 	"os"
@@ -161,7 +161,7 @@ func TestMergingTrackersByAddingSpecs(t *testing.T) {
 	require.NoError(t, err)
 	defer cl.Close()
 	spec := TorrentSpec{}
-	rand.Read(spec.InfoHash[:])
+	rand.NewChaCha8([32]byte{}).Read(spec.InfoHash[:])
 	T, new, _ := cl.AddTorrentSpec(&spec)
 	if !new {
 		t.FailNow()
diff --git a/fs/file_handle.go b/fs/file_handle.go
@@ -80,9 +80,9 @@ func (me fileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse
 	case <-readDone:
 		return readErr
 	case <-me.fn.FS.destroyed:
-		return fuse.EIO
+		return fuse.EIO //nolint:staticcheck // fuse error type
 	case <-ctx.Done():
-		return fuse.EINTR
+		return fuse.EINTR //nolint:staticcheck // fuse error type
 	}
 }
 
diff --git a/fs/torrentfs.go b/fs/torrentfs.go
@@ -131,7 +131,7 @@ func (dn dirNode) Lookup(_ context.Context, name string) (fusefs.Node, error) {
 	if dir {
 		return dirNode{n}, nil
 	}
-	return nil, fuse.ENOENT
+	return nil, fuse.ENOENT //nolint:staticcheck // fuse error type
 }
 
 func (dn dirNode) Attr(ctx context.Context, attr *fuse.Attr) error {
@@ -158,7 +158,7 @@ func (rn rootNode) Lookup(ctx context.Context, name string) (_node fusefs.Node,
 		break
 	}
 	if _node == nil {
-		err = fuse.ENOENT
+		err = fuse.ENOENT //nolint:staticcheck // fuse error type
 	}
 	return
 }
diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
@@ -180,7 +180,7 @@ func TestDownloadOnDemand(t *testing.T) {
 	go func() {
 		// Wait until we get the metainfo, then check for the data.
 		<-seederTorrent.GotInfo()
-		seederTorrent.VerifyData()
+		seederTorrent.VerifyDataContext(context.TODO())
 	}()
 	cfg = torrent.NewDefaultClientConfig()
 	cfg.DisableTrackers = true
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/anacrolix/dht/v2 v2.23.0
 	github.com/anacrolix/envpprof v1.4.0
 	github.com/anacrolix/fuse v0.3.2
-	github.com/anacrolix/generics v0.1.1-0.20251125230353-15d98d46693b
+	github.com/anacrolix/generics v0.2.0
 	github.com/anacrolix/go-libutp v1.3.2
 	github.com/anacrolix/gostdapp v0.2.1-0.20251125125325-fbac3f25c013
 	github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb
diff --git a/go.sum b/go.sum
@@ -87,6 +87,8 @@ github.com/anacrolix/fuse v0.3.2/go.mod h1:vN3X/6E+uHNjg5F8Oy9FD9I+pYxeDWeB8mNjI
 github.com/anacrolix/generics v0.0.0-20230113004304-d6428d516633/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8=
 github.com/anacrolix/generics v0.1.1-0.20251125230353-15d98d46693b h1:Kuvx/A/TTJuT9x8mn7DeGx2KW9tWn1LI8bira67xdT0=
 github.com/anacrolix/generics v0.1.1-0.20251125230353-15d98d46693b/go.mod h1:NGehhfeXJPBujPx0s6cstSj8B+TERsTY32Xckfx5ftc=
+github.com/anacrolix/generics v0.2.0 h1:gPwGOs14irokFN9kUP1i1A0Bn0FPT7/hWWD3hHKSKNw=
+github.com/anacrolix/generics v0.2.0/go.mod h1:NGehhfeXJPBujPx0s6cstSj8B+TERsTY32Xckfx5ftc=
 github.com/anacrolix/go-libutp v1.3.2 h1:WswiaxTIogchbkzNgGHuHRfbrYLpv4o290mlvcx+++M=
 github.com/anacrolix/go-libutp v1.3.2/go.mod h1:fCUiEnXJSe3jsPG554A200Qv+45ZzIIyGEvE56SHmyA=
 github.com/anacrolix/gostdapp v0.2.1-0.20251125125325-fbac3f25c013 h1:fdjruiqT1gnhzeX9kzumnGaluIlRDq6dZXZDaUUiK1k=
diff --git a/internal/indexed/misc.go b/internal/indexed/misc.go
@@ -60,6 +60,7 @@ func NewFullMappedIndex[F, T comparable](
 	return index
 }
 
+//nolint:unused // false positive with generics: implements tableInterface, called via interface
 func (me *table[R]) addIndex(_ genericRelation, trigger triggerFunc[R]) {
 	me.indexTriggers = append(me.indexTriggers, trigger)
 }
diff --git a/ltep_test.go b/ltep_test.go
@@ -1,7 +1,7 @@
 package torrent_test
 
 import (
-	"math/rand"
+	rand "math/rand/v2"
 	"strconv"
 	"testing"
 
@@ -112,7 +112,7 @@ func TestUserLtep(t *testing.T) {
 	qt.Assert(t, qt.IsNil(err))
 	defer cl2.Close()
 	addOpts := AddTorrentOpts{}
-	rand.Read(addOpts.InfoHash[:])
+	rand.NewChaCha8([32]byte{}).Read(addOpts.InfoHash[:])
 	t1, _ := cl1.AddTorrentOpt(addOpts)
 	t2, _ := cl2.AddTorrentOpt(addOpts)
 	defer testutil.ExportStatusWriter(cl1, "cl1", t)()
diff --git a/peer_protocol/ut-holepunch/err-code_test.go b/peer_protocol/ut-holepunch/err-code_test.go
@@ -6,5 +6,5 @@ import (
 )
 
 func TestUnknownErrCodeError(t *testing.T) {
-	ErrCode(rand.Uint32()).Error()
+	_ = ErrCode(rand.Uint32()).Error()
 }
diff --git a/peerconn.go b/peerconn.go
@@ -915,7 +915,7 @@ func (c *PeerConn) mainReadLoop() (err error) {
 			}
 			if !c.fastEnabled() {
 				c.deleteAllRequests("choked by non-fast PeerConn")
-			} else {
+			} else { //nolint:staticcheck // SA9003: intentionally empty, see comment below
 				// We don't decrement pending requests here, let's wait for the peer to either
 				// reject or satisfy the outstanding requests. Additionally, some peers may unchoke
 				// us and resume where they left off, we don't want to have piled on to those chunks
diff --git a/pex_test.go b/pex_test.go
@@ -264,7 +264,14 @@ func assertPexMsgsEqual(t *testing.T, expected, actual pp.PexMsg) {
 func TestPexGenmsg0(t *testing.T) {
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			s := *tc.in
+			// Copy via clone-like construction to avoid copying the embedded sync.RWMutex.
+			s := pexState{
+				tail: tc.in.tail,
+				hold: tc.in.hold,
+				rest: tc.in.rest,
+				nc:   tc.in.nc,
+				msg0: tc.in.msg0,
+			}
 			m, last := s.Genmsg(nil)
 			assertPexMsgsEqual(t, tc.targ, m)
 			if tc.update != nil {
diff --git a/requesting_test.go b/requesting_test.go
@@ -68,7 +68,7 @@ func TestForLoopRepeatItem(t *testing.T) {
 			if !once && i == 2 {
 				once = true
 				// Can we actually modify the next value of i produced by the range?
-				i--
+				i-- //nolint:ineffassign // intentional: testing that range ignores mutation
 				continue
 			}
 		}
diff --git a/storage/file-io-mmap.go b/storage/file-io-mmap.go
@@ -356,13 +356,14 @@ func (me *mmapFileHandle) seekDataOrEof(offset int64) (ret int64, err error) {
 	if lockHandleOperations {
 		mu.RUnlock()
 	}
-	if err == nil {
+	switch err {
+	case nil:
 		me.pos = ret
-	} else if err == io.EOF {
+	case io.EOF:
 		err = nil
 		ret = int64(len(me.shared.f.m))
 		me.pos = ret
-	} else {
+	default:
 		ret = me.pos
 	}
 	return
diff --git a/storage/test/bench-piece-mark-complete.go b/storage/test/bench-piece-mark-complete.go
@@ -3,7 +3,7 @@ package test_storage
 import (
 	"bytes"
 	"context"
-	"math/rand"
+	rand "math/rand/v2"
 	"sync"
 	"testing"
 
@@ -38,14 +38,14 @@ func BenchmarkPieceMarkComplete(
 	qt.Assert(b, qt.IsNil(err))
 	tw := storage.Torrent{TorrentImpl: ti}
 	defer tw.Close()
-	rand.Read(info.Pieces)
+	rand.NewChaCha8([32]byte{}).Read(info.Pieces)
 	data := make([]byte, pieceSize)
 	readData := make([]byte, pieceSize)
 	b.SetBytes(int64(numPieces) * pieceSize)
 	oneIter := func() {
 		for pieceIndex := 0; pieceIndex < numPieces; pieceIndex += 1 {
 			pi := tw.Piece(info.Piece(pieceIndex))
-			rand.Read(data)
+			rand.NewChaCha8([32]byte{}).Read(data)
 			b.StartTimer()
 			var wg sync.WaitGroup
 			for off := int64(0); off < int64(len(data)); off += ChunkSize {
diff --git a/test/leecher-storage.go b/test/leecher-storage.go
@@ -1,6 +1,7 @@
 package test
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -207,7 +208,7 @@ func testClientTransfer(t *testing.T, ps testClientTransferParams) {
 	if !canComplete {
 		// Reading from a cache doesn't refresh older pieces until we fail to read those, so we need
 		// to force a refresh since we just read the contents from start to finish.
-		go leecherTorrent.VerifyData()
+		go leecherTorrent.VerifyDataContext(context.TODO())
 	}
 	if canComplete {
 		<-leecherTorrent.Complete().On()
diff --git a/test/transfer_test.go b/test/transfer_test.go
@@ -1,6 +1,7 @@
 package test
 
 import (
+	"context"
 	"io"
 	"os"
 	"sync"
@@ -152,7 +153,7 @@ func testSeedAfterDownloading(t *testing.T, disableUtp bool) {
 	seederTorrent, ok, err := seeder.AddTorrentSpec(torrent.TorrentSpecFromMetaInfo(mi))
 	require.NoError(t, err)
 	assert.True(t, ok)
-	seederTorrent.VerifyData()
+	seederTorrent.VerifyDataContext(context.TODO())
 
 	cfg = torrent.TestingConfig(t)
 	cfg.Seed = true
@@ -202,7 +203,7 @@ func testSeedAfterDownloading(t *testing.T, disableUtp bool) {
 	{
 		// Prioritize a region, and ensure it's been hashed, so we want connections.
 		r := llg.NewReader()
-		llg.VerifyData()
+		llg.VerifyDataContext(context.TODO())
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
diff --git a/torrent.go b/torrent.go
@@ -948,7 +948,7 @@ func (t *Torrent) writeStatus(w io.Writer) {
 			func(l, r torrentTrackerAnnouncer) int {
 				lu := l.URL()
 				ru := r.URL()
-				var luns, runs url.URL = *lu, *ru
+				var luns, runs = *lu, *ru
 				luns.Scheme = ""
 				runs.Scheme = ""
 				var ml multiless.Computation
diff --git a/webseed-requesting.go b/webseed-requesting.go
@@ -203,7 +203,7 @@ func (cl *Client) updateWebseedRequests() {
 	}
 
 	printPlan := sync.OnceFunc(func() {
-		if webseed.PrintDebug {
+		if webseed.PrintDebug { //nolint:staticcheck // SA9003: intentionally empty, debug code
 			//fmt.Println(plan)
 			//fmt.Println(formatMap(existingRequests))
 		}

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ func (me fileHandle) Read(ctx context.Context, req fuse.ReadRequest, resp fuse`
`80`	`80`	`case <-readDone:`
`81`	`81`	`return readErr`
`82`	`82`	`case <-me.fn.FS.destroyed:`
`83`		`- return fuse.EIO`
	`83`	`+ return fuse.EIO //nolint:staticcheck // fuse error type`
`84`	`84`	`case <-ctx.Done():`
`85`		`- return fuse.EINTR`
	`85`	`+ return fuse.EINTR //nolint:staticcheck // fuse error type`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func (dn dirNode) Lookup(_ context.Context, name string) (fusefs.Node, error) {`
`131`	`131`	`if dir {`
`132`	`132`	`return dirNode{n}, nil`
`133`	`133`	`}`
`134`		`- return nil, fuse.ENOENT`
	`134`	`+ return nil, fuse.ENOENT //nolint:staticcheck // fuse error type`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`func (dn dirNode) Attr(ctx context.Context, attr *fuse.Attr) error {`
`@@ -158,7 +158,7 @@ func (rn rootNode) Lookup(ctx context.Context, name string) (_node fusefs.Node,`
`158`	`158`	`break`
`159`	`159`	`}`
`160`	`160`	`if _node == nil {`
`161`		`- err = fuse.ENOENT`
	`161`	`+ err = fuse.ENOENT //nolint:staticcheck // fuse error type`
`162`	`162`	`}`
`163`	`163`	`return`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ func NewFullMappedIndex[F, T comparable](`
`60`	`60`	`return index`
`61`	`61`	`}`
`62`	`62`
	`63`	`+//nolint:unused // false positive with generics: implements tableInterface, called via interface`
`63`	`64`	`func (me *table[R]) addIndex(_ genericRelation, trigger triggerFunc[R]) {`
`64`	`65`	`me.indexTriggers = append(me.indexTriggers, trigger)`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func TestUnknownErrCodeError(t *testing.T) {`
`9`		`- ErrCode(rand.Uint32()).Error()`
	`9`	`+ _ = ErrCode(rand.Uint32()).Error()`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,7 @@ func (c *PeerConn) mainReadLoop() (err error) {`
`915`	`915`	`}`
`916`	`916`	`if !c.fastEnabled() {`
`917`	`917`	`c.deleteAllRequests("choked by non-fast PeerConn")`
`918`		`- } else {`
	`918`	`+ } else { //nolint:staticcheck // SA9003: intentionally empty, see comment below`
`919`	`919`	`// We don't decrement pending requests here, let's wait for the peer to either`
`920`	`920`	`// reject or satisfy the outstanding requests. Additionally, some peers may unchoke`
`921`	`921`	`// us and resume where they left off, we don't want to have piled on to those chunks`