From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 4 Apr 2023 09:12:26 +0000 (+1000)
Subject: Import generics as g
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=42d29d95a6ba34366998b47ac21504b69a50d4eb;p=btrtrc.git

Import generics as g
---

diff --git a/client.go b/client.go
index 7524cb0f..cc328cc6 100644
--- a/client.go
+++ b/client.go
@@ -23,7 +23,7 @@ import (
 	"github.com/anacrolix/chansync/events"
 	"github.com/anacrolix/dht/v2"
 	"github.com/anacrolix/dht/v2/krpc"
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	. "github.com/anacrolix/generics"
 	"github.com/anacrolix/log"
 	"github.com/anacrolix/missinggo/perf"
@@ -195,7 +195,7 @@ func (cl *Client) announceKey() int32 {
 // Initializes a bare minimum Client. *Client and *ClientConfig must not be nil.
 func (cl *Client) init(cfg *ClientConfig) {
 	cl.config = cfg
-	generics.MakeMap(&cl.dopplegangerAddrs)
+	g.MakeMap(&cl.dopplegangerAddrs)
 	cl.torrents = make(map[metainfo.Hash]*Torrent)
 	cl.dialRateLimiter = rate.NewLimiter(10, 10)
 	cl.activeAnnounceLimiter.SlotsPerKey = 2
@@ -1461,7 +1461,7 @@ func (cl *Client) banPeerIP(ip net.IP) {
 	if !ok {
 		panic(ip)
 	}
-	generics.MakeMapIfNilAndSet(&cl.badPeerIPs, ipAddr, struct{}{})
+	g.MakeMapIfNilAndSet(&cl.badPeerIPs, ipAddr, struct{}{})
 	for _, t := range cl.torrents {
 		t.iterPeers(func(p *Peer) {
 			if p.remoteIp().Equal(ip) {
diff --git a/ordered-bitmap.go b/ordered-bitmap.go
index 3be15c5b..74106716 100644
--- a/ordered-bitmap.go
+++ b/ordered-bitmap.go
@@ -1,7 +1,7 @@
 package torrent
 
 import (
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	list "github.com/bahlo/generic-list-go"
 
 	"github.com/anacrolix/torrent/typed-roaring"
@@ -33,7 +33,7 @@ func (o *orderedBitmap[T]) Contains(index T) bool {
 func (o *orderedBitmap[T]) Add(index T) {
 	o.bitmap.Add(index)
 	if _, ok := o.elements[index]; !ok {
-		generics.MakeMapIfNilAndSet(&o.elements, index, o.order.PushBack(index))
+		g.MakeMapIfNilAndSet(&o.elements, index, o.order.PushBack(index))
 	}
 }
 
diff --git a/request-strategy/order.go b/request-strategy/order.go
index 6c134be1..f6080831 100644
--- a/request-strategy/order.go
+++ b/request-strategy/order.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"expvar"
 
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	"github.com/anacrolix/multiless"
 
 	"github.com/anacrolix/torrent/metainfo"
@@ -55,7 +55,7 @@ func GetRequestablePieces(
 		storageLeft = &cap
 	}
 	var allTorrentsUnverifiedBytes int64
-	var lastItem generics.Option[pieceRequestOrderItem]
+	var lastItem g.Option[pieceRequestOrderItem]
 	pro.tree.Scan(func(_i pieceRequestOrderItem) bool {
 		// Check that scan emits pieces in priority order.
 		if lastItem.Ok {
diff --git a/smartban.go b/smartban.go
index 96cc2acf..034a702d 100644
--- a/smartban.go
+++ b/smartban.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha1"
 	"net/netip"
 
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 
 	"github.com/anacrolix/torrent/smartban"
 )
@@ -26,7 +26,7 @@ type blockCheckingWriter struct {
 func (me *blockCheckingWriter) checkBlock() {
 	b := me.blockBuffer.Next(me.chunkSize)
 	for _, peer := range me.cache.CheckBlock(me.requestIndex, b) {
-		generics.MakeMapIfNilAndSet(&me.badPeers, peer, struct{}{})
+		g.MakeMapIfNilAndSet(&me.badPeers, peer, struct{}{})
 	}
 	me.requestIndex++
 }
diff --git a/webtorrent/tracker-client.go b/webtorrent/tracker-client.go
index 97b9b621..30a35be7 100644
--- a/webtorrent/tracker-client.go
+++ b/webtorrent/tracker-client.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	"github.com/anacrolix/log"
 	"github.com/gorilla/websocket"
 	"github.com/pion/datachannel"
@@ -286,7 +286,7 @@ func (tc *TrackerClient) announce(event tracker.AnnounceEvent, infoHash [20]byte
 		return fmt.Errorf("write AnnounceRequest: %w", err)
 	}
 	for _, offer := range offers {
-		generics.MakeMapIfNilAndSet(&tc.outboundOffers, offer.offerId, offer.outboundOfferValue)
+		g.MakeMapIfNilAndSet(&tc.outboundOffers, offer.offerId, offer.outboundOfferValue)
 	}
 	return nil
 }