17 files changed, 16 insertions, 3 deletions
diff --git a/internal/cryptocore/randsize_test.go b/internal/cryptocore/randsize_test.go
index ed91d4f..7f19820 100644
--- a/internal/cryptocore/randsize_test.go
+++ b/internal/cryptocore/randsize_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 // ^^^^^^^^^^^^ we use the "sub-benchmark" feature that was added in Go 1.7
diff --git a/internal/fusefrontend_reverse/root_node.go b/internal/fusefrontend_reverse/root_node.go
index cb8b95f..8a2afd9 100644
--- a/internal/fusefrontend_reverse/root_node.go
+++ b/internal/fusefrontend_reverse/root_node.go
@@ -65,7 +65,7 @@ func NewRootNode(args fusefrontend.Args, c *contentenc.ContentEnc, n *nametransf
 	}
 
 	shortNameMax = n.GetLongNameMax() * 3 / 4
-	shortNameMax = shortNameMax - shortNameMax % 16 - 1
+	shortNameMax = shortNameMax - shortNameMax%16 - 1
 
 	rn := &RootNode{
 		args:          args,
diff --git a/internal/fusefrontend_reverse/virtualconf.go b/internal/fusefrontend_reverse/virtualconf.go
index e8cc080..3643fad 100644
--- a/internal/fusefrontend_reverse/virtualconf.go
+++ b/internal/fusefrontend_reverse/virtualconf.go
@@ -38,7 +38,6 @@ func (n *VirtualConfNode) Getattr(ctx context.Context, fh fs.FileHandle, out *fu
 	return 0
 }
 
-
 // Check that we have implemented the fs.File* interfaces
 var _ = (fs.FileReader)((*VirtualConfFile)(nil))
 var _ = (fs.FileReleaser)((*VirtualConfFile)(nil))
diff --git a/internal/nametransform/names.go b/internal/nametransform/names.go
index 4d56d71..7a983a0 100644
--- a/internal/nametransform/names.go
+++ b/internal/nametransform/names.go
@@ -172,4 +172,4 @@ func Dir(path string) string {
 // this should be hashed.
 func (n *NameTransform) GetLongNameMax() int {
 	return n.longNameMax
-}
-\ No newline at end of file
+}
diff --git a/internal/stupidgcm/chacha.go b/internal/stupidgcm/chacha.go
index e09ed0b..de0c2e8 100644
--- a/internal/stupidgcm/chacha.go
+++ b/internal/stupidgcm/chacha.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/chacha_test.go b/internal/stupidgcm/chacha_test.go
index 5f803aa..542ff15 100644
--- a/internal/stupidgcm/chacha_test.go
+++ b/internal/stupidgcm/chacha_test.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/common.go b/internal/stupidgcm/common.go
index bb100eb..d88dc62 100644
--- a/internal/stupidgcm/common.go
+++ b/internal/stupidgcm/common.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/common_test.go b/internal/stupidgcm/common_test.go
index e5b14a4..7f38e90 100644
--- a/internal/stupidgcm/common_test.go
+++ b/internal/stupidgcm/common_test.go
@@ -1,3 +1,4 @@
+//go:build cgo && !without_openssl
 // +build cgo,!without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/gcm.go b/internal/stupidgcm/gcm.go
index 00819dd..2e5aac4 100644
--- a/internal/stupidgcm/gcm.go
+++ b/internal/stupidgcm/gcm.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/gcm_test.go b/internal/stupidgcm/gcm_test.go
index 73668fa..c730a87 100644
--- a/internal/stupidgcm/gcm_test.go
+++ b/internal/stupidgcm/gcm_test.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 // We compare against Go's built-in GCM implementation. Since stupidgcm only
diff --git a/internal/stupidgcm/locking.go b/internal/stupidgcm/locking.go
index 68ab509..04cf232 100644
--- a/internal/stupidgcm/locking.go
+++ b/internal/stupidgcm/locking.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/openssl.go b/internal/stupidgcm/openssl.go
index b46fba8..8c950f8 100644
--- a/internal/stupidgcm/openssl.go
+++ b/internal/stupidgcm/openssl.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/without_openssl.go b/internal/stupidgcm/without_openssl.go
index 42604de..fcef793 100644
--- a/internal/stupidgcm/without_openssl.go
+++ b/internal/stupidgcm/without_openssl.go
@@ -1,3 +1,4 @@
+//go:build without_openssl
 // +build without_openssl
 
 package stupidgcm
diff --git a/internal/stupidgcm/xchacha.go b/internal/stupidgcm/xchacha.go
index ca740e4..3c121ba 100644
--- a/internal/stupidgcm/xchacha.go
+++ b/internal/stupidgcm/xchacha.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 // Copyright 2018 The Go Authors. All rights reserved.
diff --git a/internal/stupidgcm/xchacha_test.go b/internal/stupidgcm/xchacha_test.go
index fdea8b5..676a023 100644
--- a/internal/stupidgcm/xchacha_test.go
+++ b/internal/stupidgcm/xchacha_test.go
@@ -1,3 +1,4 @@
+//go:build !without_openssl
 // +build !without_openssl
 
 package stupidgcm
diff --git a/internal/syscallcompat/getdents_linux.go b/internal/syscallcompat/getdents_linux.go
index cedb463..da3868f 100644
--- a/internal/syscallcompat/getdents_linux.go
+++ b/internal/syscallcompat/getdents_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package syscallcompat
diff --git a/internal/syscallcompat/getdents_test.go b/internal/syscallcompat/getdents_test.go
index a6f41ca..eb670d6 100644
--- a/internal/syscallcompat/getdents_test.go
+++ b/internal/syscallcompat/getdents_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package syscallcompat