chore: style fixes from go fix (#10846)
Just `go fix ./...` Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
@@ -664,7 +664,7 @@ func (defaults *Defaults) prepare(myID protocol.DeviceID, existingDevices map[pr
|
||||
defaults.Device.prepare(nil)
|
||||
}
|
||||
|
||||
func ensureZeroForNodefault(empty interface{}, target interface{}) {
|
||||
func ensureZeroForNodefault(empty any, target any) {
|
||||
copyMatchingTag(empty, target, "nodefault", func(v string) bool {
|
||||
if len(v) > 0 && v != "true" {
|
||||
panic(fmt.Sprintf(`unexpected tag value: %s. expected untagged or "true"`, v))
|
||||
@@ -674,7 +674,7 @@ func ensureZeroForNodefault(empty interface{}, target interface{}) {
|
||||
}
|
||||
|
||||
// copyMatchingTag copies fields tagged tag:"value" from "from" struct onto "to" struct.
|
||||
func copyMatchingTag(from interface{}, to interface{}, tag string, shouldCopy func(value string) bool) {
|
||||
func copyMatchingTag(from any, to any, tag string, shouldCopy func(value string) bool) {
|
||||
fromStruct := reflect.ValueOf(from).Elem()
|
||||
fromType := fromStruct.Type()
|
||||
|
||||
|
||||
@@ -1158,8 +1158,8 @@ func TestInvalidDeviceIDRejected(t *testing.T) {
|
||||
|
||||
// Change the device ID of the first device to "invalid". Fast and loose
|
||||
// with the type assertions as we know what the JSON decoder returns.
|
||||
devs := cfg["devices"].([]interface{})
|
||||
dev0 := devs[0].(map[string]interface{})
|
||||
devs := cfg["devices"].([]any)
|
||||
dev0 := devs[0].(map[string]any)
|
||||
dev0["deviceID"] = tc.id
|
||||
devs[0] = dev0
|
||||
|
||||
@@ -1197,8 +1197,8 @@ func TestInvalidFolderIDRejected(t *testing.T) {
|
||||
// Change the folder ID of the first folder to the empty string.
|
||||
// Fast and loose with the type assertions as we know what the JSON
|
||||
// decoder returns.
|
||||
devs := cfg["folders"].([]interface{})
|
||||
dev0 := devs[0].(map[string]interface{})
|
||||
devs := cfg["folders"].([]any)
|
||||
dev0 := devs[0].(map[string]any)
|
||||
dev0["id"] = tc.id
|
||||
devs[0] = dev0
|
||||
|
||||
@@ -1324,7 +1324,7 @@ func adjustFolderConfiguration(cfg *FolderConfiguration, id, label string, fsTyp
|
||||
// defaultConfigAsMap returns a valid default config as a JSON-decoded
|
||||
// map[string]interface{}. This is useful to override random elements and
|
||||
// re-encode into JSON.
|
||||
func defaultConfigAsMap() map[string]interface{} {
|
||||
func defaultConfigAsMap() map[string]any {
|
||||
cfg := New(device1)
|
||||
dev := cfg.Defaults.Device.Copy()
|
||||
adjustDeviceConfiguration(&dev, device2, "name")
|
||||
@@ -1337,7 +1337,7 @@ func defaultConfigAsMap() map[string]interface{} {
|
||||
// can't happen
|
||||
panic(err)
|
||||
}
|
||||
var tmp map[string]interface{}
|
||||
var tmp map[string]any
|
||||
if err := json.Unmarshal(bs, &tmp); err != nil {
|
||||
// can't happen
|
||||
panic(err)
|
||||
|
||||
@@ -9,6 +9,7 @@ package config
|
||||
import (
|
||||
"encoding/json"
|
||||
"encoding/xml"
|
||||
"maps"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
@@ -45,9 +46,7 @@ type internalParam struct {
|
||||
func (c VersioningConfiguration) Copy() VersioningConfiguration {
|
||||
cp := c
|
||||
cp.Params = make(map[string]string, len(c.Params))
|
||||
for k, v := range c.Params {
|
||||
cp.Params[k] = v
|
||||
}
|
||||
maps.Copy(cp.Params, c.Params)
|
||||
return cp
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user