Update Go, deps and linter

netquery/database.go

@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/jackc/puddle/v2"
 	"zombiezen.com/go/sqlite"
 	"zombiezen.com/go/sqlite/sqlitex"
 
-	"github.com/jackc/puddle/v2"
 	"github.com/safing/portbase/log"
 	"github.com/safing/portmaster/netquery/orm"
 	"github.com/safing/portmaster/network"
@@ -108,7 +108,6 @@ type (
 // (see Execute). To perform database writes use either Save() or ExecuteWrite().
 // Note that write connections are serialized by the Database object before being
 // handed over to SQLite.
-//
 func New(path string) (*Database, error) {
 	constructor := func(ctx context.Context) (*sqlite.Conn, error) {
 		c, err := sqlite.OpenConn(
@@ -331,7 +330,7 @@ func (db *Database) Save(ctx context.Context, conn Conn) error {
 	for key := range connMap {
 		keys = append(keys, key)
 	}
-	sort.Sort(sort.StringSlice(keys))
+	sort.Strings(keys)
 
 	for _, key := range keys {
 		value := connMap[key]

netquery/orm/decoder.go

@@ -63,7 +63,6 @@ type (
 // Decoding hooks configured in cfg are executed before trying to decode basic types and may
 // be specified to provide support for special types.
 // See DatetimeDecoder() for an example of a DecodeHook that handles graceful time.Time conversion.
-//
 func DecodeStmt(ctx context.Context, schema *TableSchema, stmt Stmt, result interface{}, cfg DecodeConfig) error {
 	// make sure we got something to decode into ...
 	if result == nil {

netquery/orm/query_runner.go

@@ -94,13 +94,12 @@ func WithDecodeConfig(cfg DecodeConfig) QueryOption {
 //
 // Example:
 //
-//		var result []struct{
-//			Count int `sqlite:"rowCount"`
-//		}
-//
-//		err := RunQuery(ctx, conn, "SELECT COUNT(*) AS rowCount FROM table", WithResult(&result))
-//		fmt.Println(result[0].Count)
+//	var result []struct{
+//		Count int `sqlite:"rowCount"`
+//	}
 //
+//	err := RunQuery(ctx, conn, "SELECT COUNT(*) AS rowCount FROM table", WithResult(&result))
+//	fmt.Println(result[0].Count)
 func RunQuery(ctx context.Context, conn *sqlite.Conn, sql string, modifiers ...QueryOption) error {
 	args := queryOpts{
 		DecodeConfig: DefaultDecodeConfig,

netquery/query.go

@@ -17,6 +17,7 @@ import (
 // Collection of Query and Matcher types.
 // NOTE: whenever adding support for new operators make sure
 // to update UnmarshalJSON as well.
+//
 //nolint:golint
 type (
 	Query map[string][]Matcher