Run gofmt on dendrite - apply go 1.17 preferred build tags (#2021)

33 files changed, 33 insertions, 0 deletions

diff --git a/appservice/storage/storage.go b/appservice/storage/storage.go
index b0df2b7d..97b8501e 100644
--- a/appservice/storage/storage.go
+++ b/appservice/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/build/gobind-pinecone/platform_ios.go b/build/gobind-pinecone/platform_ios.go
index 01f8a6a0..802d7fac 100644
--- a/build/gobind-pinecone/platform_ios.go
+++ b/build/gobind-pinecone/platform_ios.go
@@ -1,3 +1,4 @@
+//go:build ios
 // +build ios
 
 package gobind
diff --git a/build/gobind-pinecone/platform_other.go b/build/gobind-pinecone/platform_other.go
index fdfb13bc..2e81e2f4 100644
--- a/build/gobind-pinecone/platform_other.go
+++ b/build/gobind-pinecone/platform_other.go
@@ -1,3 +1,4 @@
+//go:build !ios
 // +build !ios
 
 package gobind
diff --git a/build/gobind-yggdrasil/platform_ios.go b/build/gobind-yggdrasil/platform_ios.go
index 01f8a6a0..802d7fac 100644
--- a/build/gobind-yggdrasil/platform_ios.go
+++ b/build/gobind-yggdrasil/platform_ios.go
@@ -1,3 +1,4 @@
+//go:build ios
 // +build ios
 
 package gobind
diff --git a/build/gobind-yggdrasil/platform_other.go b/build/gobind-yggdrasil/platform_other.go
index fdfb13bc..2e81e2f4 100644
--- a/build/gobind-yggdrasil/platform_other.go
+++ b/build/gobind-yggdrasil/platform_other.go
@@ -1,3 +1,4 @@
+//go:build !ios
 // +build !ios
 
 package gobind
diff --git a/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go b/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go
index 4d2da55c..8b3be72c 100644
--- a/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go
+++ b/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go
@@ -1,3 +1,4 @@
+//go:build elementweb
 // +build elementweb
 
 package embed
diff --git a/cmd/dendrite-demo-pinecone/embed/embed_other.go b/cmd/dendrite-demo-pinecone/embed/embed_other.go
index 04c2188c..a4b22345 100644
--- a/cmd/dendrite-demo-pinecone/embed/embed_other.go
+++ b/cmd/dendrite-demo-pinecone/embed/embed_other.go
@@ -1,3 +1,4 @@
+//go:build !elementweb
 // +build !elementweb
 
 package embed
diff --git a/cmd/dendrite-demo-yggdrasil/embed/embed_elementweb.go b/cmd/dendrite-demo-yggdrasil/embed/embed_elementweb.go
index 8d49c553..e7725ec8 100644
--- a/cmd/dendrite-demo-yggdrasil/embed/embed_elementweb.go
+++ b/cmd/dendrite-demo-yggdrasil/embed/embed_elementweb.go
@@ -1,3 +1,4 @@
+//go:build elementweb
 // +build elementweb
 
 package embed
diff --git a/cmd/dendrite-demo-yggdrasil/embed/embed_other.go b/cmd/dendrite-demo-yggdrasil/embed/embed_other.go
index 04c2188c..a4b22345 100644
--- a/cmd/dendrite-demo-yggdrasil/embed/embed_other.go
+++ b/cmd/dendrite-demo-yggdrasil/embed/embed_other.go
@@ -1,3 +1,4 @@
+//go:build !elementweb
 // +build !elementweb
 
 package embed
diff --git a/cmd/dendritejs-pinecone/jsServer.go b/cmd/dendritejs-pinecone/jsServer.go
index 074d20cb..4298c2ae 100644
--- a/cmd/dendritejs-pinecone/jsServer.go
+++ b/cmd/dendritejs-pinecone/jsServer.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package main
diff --git a/cmd/dendritejs-pinecone/main_noop.go b/cmd/dendritejs-pinecone/main_noop.go
index dcea032f..0cc7e47e 100644
--- a/cmd/dendritejs-pinecone/main_noop.go
+++ b/cmd/dendritejs-pinecone/main_noop.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package main
diff --git a/cmd/dendritejs-pinecone/main_test.go b/cmd/dendritejs-pinecone/main_test.go
index 751700cb..17fea6cc 100644
--- a/cmd/dendritejs-pinecone/main_test.go
+++ b/cmd/dendritejs-pinecone/main_test.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package main
diff --git a/cmd/dendritejs/jsServer.go b/cmd/dendritejs/jsServer.go
index 074d20cb..4298c2ae 100644
--- a/cmd/dendritejs/jsServer.go
+++ b/cmd/dendritejs/jsServer.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package main
diff --git a/cmd/dendritejs/keyfetcher.go b/cmd/dendritejs/keyfetcher.go
index cef04537..cdf93764 100644
--- a/cmd/dendritejs/keyfetcher.go
+++ b/cmd/dendritejs/keyfetcher.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package main
diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go
index d8fc8b83..10aadb6e 100644
--- a/cmd/dendritejs/main.go
+++ b/cmd/dendritejs/main.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package main
diff --git a/cmd/dendritejs/main_noop.go b/cmd/dendritejs/main_noop.go
index dcea032f..0cc7e47e 100644
--- a/cmd/dendritejs/main_noop.go
+++ b/cmd/dendritejs/main_noop.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package main
diff --git a/cmd/dendritejs/publicrooms.go b/cmd/dendritejs/publicrooms.go
index a4623ba3..19afc5bc 100644
--- a/cmd/dendritejs/publicrooms.go
+++ b/cmd/dendritejs/publicrooms.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package main
diff --git a/federationsender/storage/storage.go b/federationsender/storage/storage.go
index 5462c352..46e01f25 100644
--- a/federationsender/storage/storage.go
+++ b/federationsender/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/internal/sqlutil/postgres.go b/internal/sqlutil/postgres.go
index 41a5508a..5e656b1d 100644
--- a/internal/sqlutil/postgres.go
+++ b/internal/sqlutil/postgres.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package sqlutil
diff --git a/internal/sqlutil/postgres_wasm.go b/internal/sqlutil/postgres_wasm.go
index c45842f0..34086f45 100644
--- a/internal/sqlutil/postgres_wasm.go
+++ b/internal/sqlutil/postgres_wasm.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package sqlutil
diff --git a/internal/sqlutil/trace_driver.go b/internal/sqlutil/trace_driver.go
index f123b1e4..b7bb3676 100644
--- a/internal/sqlutil/trace_driver.go
+++ b/internal/sqlutil/trace_driver.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package sqlutil
diff --git a/internal/sqlutil/trace_driver_wasm.go b/internal/sqlutil/trace_driver_wasm.go
index a3c163f5..51b60c3c 100644
--- a/internal/sqlutil/trace_driver_wasm.go
+++ b/internal/sqlutil/trace_driver_wasm.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package sqlutil
diff --git a/keyserver/storage/storage.go b/keyserver/storage/storage.go
index 8f05d003..742e8463 100644
--- a/keyserver/storage/storage.go
+++ b/keyserver/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go
index a976f795..56059f1c 100644
--- a/mediaapi/storage/storage.go
+++ b/mediaapi/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/mediaapi/thumbnailer/thumbnailer_bimg.go b/mediaapi/thumbnailer/thumbnailer_bimg.go
index 087385a7..6ca53317 100644
--- a/mediaapi/thumbnailer/thumbnailer_bimg.go
+++ b/mediaapi/thumbnailer/thumbnailer_bimg.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build bimg
 // +build bimg
 
 package thumbnailer
diff --git a/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go
index d7aa294a..beae88c5 100644
--- a/mediaapi/thumbnailer/thumbnailer_nfnt.go
+++ b/mediaapi/thumbnailer/thumbnailer_nfnt.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !bimg
 // +build !bimg
 
 package thumbnailer
diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go
index 9359312d..9f98ea3e 100644
--- a/roomserver/storage/storage.go
+++ b/roomserver/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/signingkeyserver/storage/keydb.go b/signingkeyserver/storage/keydb.go
index aa247f1d..82b6d0ad 100644
--- a/signingkeyserver/storage/keydb.go
+++ b/signingkeyserver/storage/keydb.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/signingkeyserver/storage/keydb_wasm.go b/signingkeyserver/storage/keydb_wasm.go
index 187d9669..b112993a 100644
--- a/signingkeyserver/storage/keydb_wasm.go
+++ b/signingkeyserver/storage/keydb_wasm.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package storage
diff --git a/syncapi/storage/storage.go b/syncapi/storage/storage.go
index 15386c33..7f9c28e9 100644
--- a/syncapi/storage/storage.go
+++ b/syncapi/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/userapi/storage/accounts/sqlite3/constraint_wasm.go b/userapi/storage/accounts/sqlite3/constraint_wasm.go
index 0dd5b1fe..6c4ee762 100644
--- a/userapi/storage/accounts/sqlite3/constraint_wasm.go
+++ b/userapi/storage/accounts/sqlite3/constraint_wasm.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package sqlite3
diff --git a/userapi/storage/accounts/storage.go b/userapi/storage/accounts/storage.go
index 3489c9d0..a21f7d94 100644
--- a/userapi/storage/accounts/storage.go
+++ b/userapi/storage/accounts/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package accounts
diff --git a/userapi/storage/devices/storage.go b/userapi/storage/devices/storage.go
index bfce924d..3c203430 100644
--- a/userapi/storage/devices/storage.go
+++ b/userapi/storage/devices/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package devices