From b88603e89ae35755354ca3b7b8400da60bc63ddb Mon Sep 17 00:00:00 2001 From: notCuteSocks <177598040+notCuteSocks@users.noreply.github.com> Date: Wed, 18 Sep 2024 05:07:53 +0000 Subject: [PATCH] fix: fix issues #973 by migrating missinggo/perf to missinggo/v2/perf. --- client.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- mse/mse.go | 5 +++-- socket.go | 2 +- tests/add-webseed-after-priorities/go.mod | 2 +- tests/add-webseed-after-priorities/go.sum | 4 ++-- tests/webseed-partial-seed/go.mod | 2 +- tests/webseed-partial-seed/go.sum | 4 ++-- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/client.go b/client.go index 31a6d88c99..47b43042db 100644 --- a/client.go +++ b/client.go @@ -25,9 +25,9 @@ import ( . "github.com/anacrolix/generics" g "github.com/anacrolix/generics" "github.com/anacrolix/log" - "github.com/anacrolix/missinggo/perf" "github.com/anacrolix/missinggo/v2" "github.com/anacrolix/missinggo/v2/bitmap" + "github.com/anacrolix/missinggo/v2/perf" "github.com/anacrolix/missinggo/v2/pproffd" "github.com/anacrolix/sync" "github.com/cespare/xxhash" diff --git a/go.mod b/go.mod index 1e1929b690..6b6b8deb77 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/anacrolix/gostdapp v0.1.0 github.com/anacrolix/log v0.15.3-0.20240627045001-cd912c641d83 github.com/anacrolix/missinggo v1.3.0 - github.com/anacrolix/missinggo/perf v1.0.0 + github.com/anacrolix/missinggo/v2/perf v1.0.0 github.com/anacrolix/missinggo/v2 v2.7.3 github.com/anacrolix/multiless v0.3.0 github.com/anacrolix/possum/go v0.1.1-0.20240321122240-a01f3a22f2d1 diff --git a/go.sum b/go.sum index 375d9e5a86..8aa11a3283 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/anacrolix/missinggo v1.1.2-0.20190815015349-b888af804467/go.mod h1:MB github.com/anacrolix/missinggo v1.2.1/go.mod h1:J5cMhif8jPmFoC3+Uvob3OXXNIhOUikzMt+uUjeM21Y= github.com/anacrolix/missinggo v1.3.0 h1:06HlMsudotL7BAELRZs0yDZ4yVXsHXGi323QBjAVASw= github.com/anacrolix/missinggo v1.3.0/go.mod h1:bqHm8cE8xr+15uVfMG3BFui/TxyB6//H5fwlq/TeqMc= -github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= -github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= +github.com/anacrolix/missinggo/v2/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= +github.com/anacrolix/missinggo/v2/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY= github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA= github.com/anacrolix/missinggo/v2 v2.7.3 h1:Ee//CmZBMadeNiYB/hHo9ly2PFOEZ4Fhsbnug3rDAIE= diff --git a/mse/mse.go b/mse/mse.go index f1bd63b8a3..6bbc6e0c8d 100644 --- a/mse/mse.go +++ b/mse/mse.go @@ -12,14 +12,15 @@ import ( "errors" "expvar" "fmt" - "github.com/anacrolix/torrent/internal/ctxrw" "io" "math" "math/big" "strconv" "sync" - "github.com/anacrolix/missinggo/perf" + "github.com/anacrolix/torrent/internal/ctxrw" + + "github.com/anacrolix/missinggo/v2/perf" ) const ( diff --git a/socket.go b/socket.go index 18c8b86034..e34ff90636 100644 --- a/socket.go +++ b/socket.go @@ -11,8 +11,8 @@ import ( g "github.com/anacrolix/generics" "github.com/anacrolix/log" - "github.com/anacrolix/missinggo/perf" "github.com/anacrolix/missinggo/v2" + "github.com/anacrolix/missinggo/v2/perf" ) type Listener interface { diff --git a/tests/add-webseed-after-priorities/go.mod b/tests/add-webseed-after-priorities/go.mod index 98e2891808..3b2ce83a35 100644 --- a/tests/add-webseed-after-priorities/go.mod +++ b/tests/add-webseed-after-priorities/go.mod @@ -18,7 +18,7 @@ require ( github.com/anacrolix/go-libutp v1.3.1 // indirect github.com/anacrolix/log v0.15.2 // indirect github.com/anacrolix/missinggo v1.3.0 // indirect - github.com/anacrolix/missinggo/perf v1.0.0 // indirect + github.com/anacrolix/missinggo/v2/perf v1.0.0 // indirect github.com/anacrolix/missinggo/v2 v2.7.3 // indirect github.com/anacrolix/mmsg v1.0.0 // indirect github.com/anacrolix/multiless v0.3.0 // indirect diff --git a/tests/add-webseed-after-priorities/go.sum b/tests/add-webseed-after-priorities/go.sum index 639f20beb6..400ba5c195 100644 --- a/tests/add-webseed-after-priorities/go.sum +++ b/tests/add-webseed-after-priorities/go.sum @@ -54,8 +54,8 @@ github.com/anacrolix/missinggo v1.1.2-0.20190815015349-b888af804467/go.mod h1:MB github.com/anacrolix/missinggo v1.2.1/go.mod h1:J5cMhif8jPmFoC3+Uvob3OXXNIhOUikzMt+uUjeM21Y= github.com/anacrolix/missinggo v1.3.0 h1:06HlMsudotL7BAELRZs0yDZ4yVXsHXGi323QBjAVASw= github.com/anacrolix/missinggo v1.3.0/go.mod h1:bqHm8cE8xr+15uVfMG3BFui/TxyB6//H5fwlq/TeqMc= -github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= -github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= +github.com/anacrolix/missinggo/v2/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= +github.com/anacrolix/missinggo/v2/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY= github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA= github.com/anacrolix/missinggo/v2 v2.7.3 h1:Ee//CmZBMadeNiYB/hHo9ly2PFOEZ4Fhsbnug3rDAIE= diff --git a/tests/webseed-partial-seed/go.mod b/tests/webseed-partial-seed/go.mod index 98e2891808..3b2ce83a35 100644 --- a/tests/webseed-partial-seed/go.mod +++ b/tests/webseed-partial-seed/go.mod @@ -18,7 +18,7 @@ require ( github.com/anacrolix/go-libutp v1.3.1 // indirect github.com/anacrolix/log v0.15.2 // indirect github.com/anacrolix/missinggo v1.3.0 // indirect - github.com/anacrolix/missinggo/perf v1.0.0 // indirect + github.com/anacrolix/missinggo/v2/perf v1.0.0 // indirect github.com/anacrolix/missinggo/v2 v2.7.3 // indirect github.com/anacrolix/mmsg v1.0.0 // indirect github.com/anacrolix/multiless v0.3.0 // indirect diff --git a/tests/webseed-partial-seed/go.sum b/tests/webseed-partial-seed/go.sum index 639f20beb6..400ba5c195 100644 --- a/tests/webseed-partial-seed/go.sum +++ b/tests/webseed-partial-seed/go.sum @@ -54,8 +54,8 @@ github.com/anacrolix/missinggo v1.1.2-0.20190815015349-b888af804467/go.mod h1:MB github.com/anacrolix/missinggo v1.2.1/go.mod h1:J5cMhif8jPmFoC3+Uvob3OXXNIhOUikzMt+uUjeM21Y= github.com/anacrolix/missinggo v1.3.0 h1:06HlMsudotL7BAELRZs0yDZ4yVXsHXGi323QBjAVASw= github.com/anacrolix/missinggo v1.3.0/go.mod h1:bqHm8cE8xr+15uVfMG3BFui/TxyB6//H5fwlq/TeqMc= -github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= -github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= +github.com/anacrolix/missinggo/v2/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= +github.com/anacrolix/missinggo/v2/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY= github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA= github.com/anacrolix/missinggo/v2 v2.7.3 h1:Ee//CmZBMadeNiYB/hHo9ly2PFOEZ4Fhsbnug3rDAIE=