From dec05c334707346506a979e1cdb3b295dbad5c4f Mon Sep 17 00:00:00 2001
From: PiotrKozimor <37144818+PiotrKozimor@users.noreply.github.com>
Date: Tue, 2 Nov 2021 17:48:48 +0100
Subject: [PATCH] Run gofmt on dendrite - apply go 1.17 preferred build tags
 (#2021)

---
 appservice/storage/storage.go                         | 1 +
 build/gobind-pinecone/platform_ios.go                 | 1 +
 build/gobind-pinecone/platform_other.go               | 1 +
 build/gobind-yggdrasil/platform_ios.go                | 1 +
 build/gobind-yggdrasil/platform_other.go              | 1 +
 cmd/dendrite-demo-pinecone/embed/embed_elementweb.go  | 1 +
 cmd/dendrite-demo-pinecone/embed/embed_other.go       | 1 +
 cmd/dendrite-demo-yggdrasil/embed/embed_elementweb.go | 1 +
 cmd/dendrite-demo-yggdrasil/embed/embed_other.go      | 1 +
 cmd/dendritejs-pinecone/jsServer.go                   | 1 +
 cmd/dendritejs-pinecone/main_noop.go                  | 1 +
 cmd/dendritejs-pinecone/main_test.go                  | 1 +
 cmd/dendritejs/jsServer.go                            | 1 +
 cmd/dendritejs/keyfetcher.go                          | 1 +
 cmd/dendritejs/main.go                                | 1 +
 cmd/dendritejs/main_noop.go                           | 1 +
 cmd/dendritejs/publicrooms.go                         | 1 +
 federationsender/storage/storage.go                   | 1 +
 internal/sqlutil/postgres.go                          | 1 +
 internal/sqlutil/postgres_wasm.go                     | 1 +
 internal/sqlutil/trace_driver.go                      | 1 +
 internal/sqlutil/trace_driver_wasm.go                 | 1 +
 keyserver/storage/storage.go                          | 1 +
 mediaapi/storage/storage.go                           | 1 +
 mediaapi/thumbnailer/thumbnailer_bimg.go              | 1 +
 mediaapi/thumbnailer/thumbnailer_nfnt.go              | 1 +
 roomserver/storage/storage.go                         | 1 +
 signingkeyserver/storage/keydb.go                     | 1 +
 signingkeyserver/storage/keydb_wasm.go                | 1 +
 syncapi/storage/storage.go                            | 1 +
 userapi/storage/accounts/sqlite3/constraint_wasm.go   | 1 +
 userapi/storage/accounts/storage.go                   | 1 +
 userapi/storage/devices/storage.go                    | 1 +
 33 files changed, 33 insertions(+)

diff --git a/appservice/storage/storage.go b/appservice/storage/storage.go
index b0df2b7dc..97b8501e2 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 01f8a6a04..802d7faca 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 fdfb13bc0..2e81e2f43 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 01f8a6a04..802d7faca 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 fdfb13bc0..2e81e2f43 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 4d2da55cb..8b3be72c1 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 04c2188c3..a4b223452 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 8d49c553a..e7725ec83 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 04c2188c3..a4b223452 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 074d20cba..4298c2ae9 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 dcea032f2..0cc7e47e5 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 751700cb2..17fea6cce 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 074d20cba..4298c2ae9 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 cef045372..cdf937649 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 d8fc8b837..10aadb6e5 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 dcea032f2..0cc7e47e5 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 a4623ba32..19afc5bcf 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 5462c3523..46e01f256 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 41a5508a1..5e656b1da 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 c45842f0c..34086f450 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 f123b1e4d..b7bb36764 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 a3c163f50..51b60c3c8 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 8f05d0030..742e8463a 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 a976f795b..56059f1c8 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 087385a76..6ca533176 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 d7aa294ac..beae88c5c 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 9359312db..9f98ea3ed 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 aa247f1d8..82b6d0ad5 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 187d9669f..b112993a1 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 15386c338..7f9c28e9d 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 0dd5b1fea..6c4ee762f 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 3489c9d07..a21f7d94e 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 bfce924d9..3c2034300 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