mirror of
https://github.com/stashapp/stash.git
synced 2025-12-13 20:03:02 +01:00
45f700d6ea
* Upgrade gqlgen to v0.17.2 This enables builds on Go 1.18. github.com/vektah/gqlparser is upgraded to the newest version too. Getting this to work is a bit of a hazzle. I had to first remove vendoring from the repository, perform the upgrade and then re-introduce the vendor directory. I think gqlgens analysis went wrong for some reason on the upgrade. It would seem a clean-room installation fixed it. * Bump project to 1.18 * Update all packages, address gqlgenc breaking changes * Let `go mod tidy` handle the go.mod file * Upgrade linter to 1.45.2 * Introduce v1.45.2 of the linter The linter now correctly warns on `strings.Title` because it isn't unicode-aware. Fix this by using the suggested fix from x/text/cases to produce unicode-aware strings. The mapping isn't entirely 1-1 as this new approach has a larger iface: it spans all of unicode rather than just ASCII. It coincides for ASCII however, so things should be largely the same. * Ready ourselves for errchkjson and contextcheck. * Revert dockerfile golang version changes for now Co-authored-by: Kermie <kermie@isinthe.house> Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
19 lines
671 B
Go
19 lines
671 B
Go
package json
|
|
|
|
// JSONMarshalFunc is used to marshal interface to JSON encoded byte slice.
|
|
// Making it package level instead of embedded in Encoder brings
|
|
// some extra efforts at importing, but avoids value copy when the functions
|
|
// of Encoder being invoked.
|
|
// DO REMEMBER to set this variable at importing, or
|
|
// you might get a nil pointer dereference panic at runtime.
|
|
var JSONMarshalFunc func(v interface{}) ([]byte, error)
|
|
|
|
type Encoder struct{}
|
|
|
|
// AppendKey appends a new key to the output JSON.
|
|
func (e Encoder) AppendKey(dst []byte, key string) []byte {
|
|
if dst[len(dst)-1] != '{' {
|
|
dst = append(dst, ',')
|
|
}
|
|
return append(e.AppendString(dst, key), ':')
|
|
}
|