From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 6 Oct 2021 07:36:25 +0000 (+1100)
Subject: Remove old-style build tags
X-Git-Tag: v1.33.0~7
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=11ae25660ad3048ee5736694793fead3305f5c5b;p=btrtrc.git

Remove old-style build tags
---

diff --git a/client-nowasm_test.go b/client-nowasm_test.go
index 62c5a1db..7725f71e 100644
--- a/client-nowasm_test.go
+++ b/client-nowasm_test.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package torrent
 
diff --git a/iplist/packed.go b/iplist/packed.go
index 5ae1faea..62f51db7 100644
--- a/iplist/packed.go
+++ b/iplist/packed.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package iplist
 
diff --git a/issue211_test.go b/issue211_test.go
index 5d93d1f2..e9b9f0f3 100644
--- a/issue211_test.go
+++ b/issue211_test.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package torrent
 
diff --git a/storage/bolt-piece-completion.go b/storage/bolt-piece-completion.go
index 43417f20..fcf3143b 100644
--- a/storage/bolt-piece-completion.go
+++ b/storage/bolt-piece-completion.go
@@ -1,5 +1,4 @@
 //go:build !noboltdb && !wasm
-// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/bolt-piece.go b/storage/bolt-piece.go
index 12916ee5..644dc88c 100644
--- a/storage/bolt-piece.go
+++ b/storage/bolt-piece.go
@@ -1,5 +1,4 @@
 //go:build !noboltdb && !wasm
-// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/bolt.go b/storage/bolt.go
index 4473b841..6885c865 100644
--- a/storage/bolt.go
+++ b/storage/bolt.go
@@ -1,5 +1,4 @@
 //go:build !noboltdb && !wasm
-// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/default-dir-piece-completion-sqlite.go b/storage/default-dir-piece-completion-sqlite.go
index beb992fc..412abaeb 100644
--- a/storage/default-dir-piece-completion-sqlite.go
+++ b/storage/default-dir-piece-completion-sqlite.go
@@ -1,5 +1,4 @@
 //go:build cgo && !nosqlite
-// +build cgo,!nosqlite
 
 package storage
 
diff --git a/storage/mmap.go b/storage/mmap.go
index 9c9e8471..db96d2c2 100644
--- a/storage/mmap.go
+++ b/storage/mmap.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package storage
 
diff --git a/storage/sqlite-piece-completion.go b/storage/sqlite-piece-completion.go
index 5f31e413..1ae0984f 100644
--- a/storage/sqlite-piece-completion.go
+++ b/storage/sqlite-piece-completion.go
@@ -1,5 +1,4 @@
 //go:build cgo && !nosqlite
-// +build cgo,!nosqlite
 
 package storage
 
diff --git a/storage/sqlite/direct.go b/storage/sqlite/direct.go
index 4fda7d0c..e74cc960 100644
--- a/storage/sqlite/direct.go
+++ b/storage/sqlite/direct.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package sqliteStorage
 
diff --git a/storage/sqlite/sqlite-storage_test.go b/storage/sqlite/sqlite-storage_test.go
index 43c743e3..dc869a6e 100644
--- a/storage/sqlite/sqlite-storage_test.go
+++ b/storage/sqlite/sqlite-storage_test.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package sqliteStorage
 
diff --git a/torrent_mmap_test.go b/torrent_mmap_test.go
index 81143095..c09932dc 100644
--- a/torrent_mmap_test.go
+++ b/torrent_mmap_test.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package torrent
 
diff --git a/utp_libutp.go b/utp_libutp.go
index 1e8fa673..cbb0d69a 100644
--- a/utp_libutp.go
+++ b/utp_libutp.go
@@ -1,10 +1,9 @@
 //go:build cgo && !disable_libutp
-// +build cgo,!disable_libutp
 
 package torrent
 
 import (
-	"github.com/anacrolix/go-libutp"
+	utp "github.com/anacrolix/go-libutp"
 )
 
 func NewUtpSocket(network, addr string, fc firewallCallback) (utpSocket, error) {