rename interface{} to any

Author: xgfone

README.md

@@ -53,7 +53,7 @@ func main() {
 	}
 
 	// Add the observer to observe the change of the options.
-	gconf.Observe(func(optName string, oldValue, newValue interface{}) {
+	gconf.Observe(func(optName string, oldValue, newValue any) {
 		fmt.Printf("option=%s: %v -> %v\n", optName, oldValue, newValue)
 	})
 
@@ -225,7 +225,7 @@ func main() {
 
 ## Data Decoder
 
-The data decoder is a function like `func(src []byte, dst map[string]interface{}) error`, which is used to decode the configration data from the data source.
+The data decoder is a function like `func(src []byte, dst map[string]any) error`, which is used to decode the configration data from the data source.
 
 `Config` supports three kinds of decoders by default, such as `ini`, `json`, `yaml`, and `yml` is the alias of `yaml`. You can customize yourself decoder, then add it into `Config`, such as `Config.AddDecoder("type", NewCustomizedDecoder())`.
 
@@ -287,7 +287,7 @@ func main() {
 		fmt.Printf("%s: %v\n", opt.Name, gconf.Get(opt.Name))
 	}
 
-	gconf.Observe(func(optName string, oldValue, newValue interface{}) {
+	gconf.Observe(func(optName string, oldValue, newValue any) {
 		fmt.Printf("%s: %v -> %v\n", optName, oldValue, newValue)
 	})
 

config.go

@@ -39,18 +39,18 @@ type option struct {
 	opt   Opt
 }
 
-func (o *option) GetValue() interface{} {
+func (o *option) GetValue() any {
 	return o.value.Load()
 }
 
-func (o *option) Get() (value interface{}) {
+func (o *option) Get() (value any) {
 	if value = o.value.Load(); value == nil {
 		value = o.opt.Default
 	}
 	return
 }
 
-func (o *option) Set(c *Config, newvalue interface{}) {
+func (o *option) Set(c *Config, newvalue any) {
 	oldvalue := o.value.Swap(newvalue)
 	if oldvalue == nil {
 		oldvalue = o.opt.Default
@@ -59,7 +59,7 @@ func (o *option) Set(c *Config, newvalue interface{}) {
 }
 
 // Observer is used to observe the change of the option value.
-type Observer func(optName string, oldValue, newValue interface{})
+type Observer func(optName string, oldValue, newValue any)
 
 // Config is used to manage the configuration options.
 type Config struct {
@@ -74,7 +74,7 @@ type Config struct {
 	// Errorf is used to log the error.
 	//
 	// Default: log.Printf
-	Errorf func(format string, args ...interface{})
+	Errorf func(format string, args ...any)
 
 	gen       uint64
 	gsep      string
@@ -127,10 +127,10 @@ func (c *Config) SetVersion(version string) {
 }
 
 func (c *Config) fixOptionName(name string) string {
-	return strings.Replace(name, "-", "_", -1)
+	return strings.ReplaceAll(name, "-", "_")
 }
 
-func (c *Config) errorf(format string, args ...interface{}) {
+func (c *Config) errorf(format string, args ...any) {
 	if c.Errorf == nil {
 		log.Printf(format, args...)
 	} else {
@@ -147,7 +147,7 @@ func (c *Config) Observe(observers ...Observer) {
 	c.observers = append(c.observers, observers...)
 }
 
-func (c *Config) observe(o *option, old, new interface{}) {
+func (c *Config) observe(o *option, old, new any) {
 	if !reflect.DeepEqual(old, new) {
 		atomic.AddUint64(&c.gen, 1)
 		for _, observe := range c.observers {
@@ -297,8 +297,8 @@ func (c *Config) getOpts(filter func(Opt) bool) []Opt {
 	return opts
 }
 
-func (c *Config) updateOpt(name string, value interface{}, set bool) (
-	*option, interface{}, error) {
+func (c *Config) updateOpt(name string, value any, set bool) (
+	*option, any, error) {
 	if value == nil {
 		return nil, nil, nil
 	}
@@ -333,20 +333,19 @@ func (c *Config) updateOpt(name string, value interface{}, set bool) (
 	return opt, newvalue, nil
 }
 
-func (c *Config) checkMultilayerMap(ms map[string]interface{}) (yes bool) {
+func (c *Config) checkMultilayerMap(ms map[string]any) (yes bool) {
 	for _, value := range ms {
 		switch value.(type) {
 		case map[string]string,
-			map[string]interface{},
-			map[interface{}]interface{}:
+			map[string]any,
+			map[any]any:
 			return true
 		}
 	}
 	return false
 }
 
-func (c *Config) flatmap2(prefix string, results map[string]interface{},
-	maps map[interface{}]interface{}) {
+func (c *Config) flatmap2(prefix string, results map[string]any, maps map[any]any) {
 	if prefix != "" {
 		prefix += c.gsep
 	}
@@ -364,17 +363,17 @@ func (c *Config) flatmap2(prefix string, results map[string]interface{},
 			for _k, _v := range vs {
 				results[prefix+k+c.gsep+_k] = _v
 			}
-		case map[string]interface{}:
+		case map[string]any:
 			c.flatmap(prefix+k, results, vs)
-		case map[interface{}]interface{}:
+		case map[any]any:
 			c.flatmap2(prefix+k, results, vs)
 		default:
 			results[prefix+k] = value
 		}
 	}
 }
 
-func (c *Config) flatmap(prefix string, results, maps map[string]interface{}) {
+func (c *Config) flatmap(prefix string, results, maps map[string]any) {
 	if prefix != "" {
 		prefix += c.gsep
 	}
@@ -385,19 +384,19 @@ func (c *Config) flatmap(prefix string, results, maps map[string]interface{}) {
 			for k, v := range vs {
 				results[prefix+key+c.gsep+k] = v
 			}
-		case map[string]interface{}:
+		case map[string]any:
 			c.flatmap(prefix+key, results, vs)
-		case map[interface{}]interface{}:
+		case map[any]any:
 			c.flatmap2(prefix+key, results, vs)
 		default:
 			results[prefix+key] = value
 		}
 	}
 }
 
-func (c *Config) flatMap(maps map[string]interface{}) map[string]interface{} {
+func (c *Config) flatMap(maps map[string]any) map[string]any {
 	if c.checkMultilayerMap(maps) {
-		tmp := make(map[string]interface{}, len(maps)*2)
+		tmp := make(map[string]any, len(maps)*2)
 		c.flatmap("", tmp, maps)
 		return tmp
 	}
@@ -408,7 +407,7 @@ func (c *Config) flatMap(maps map[string]interface{}) map[string]interface{} {
 // and load all if failing to parse the value of any option.
 //
 // If force is missing or false, ignore the assigned options.
-func (c *Config) LoadMap(options map[string]interface{}, force ...bool) error {
+func (c *Config) LoadMap(options map[string]any, force ...bool) error {
 	if len(options) == 0 {
 		return nil
 	}
@@ -420,7 +419,7 @@ func (c *Config) LoadMap(options map[string]interface{}, force ...bool) error {
 
 	type opt struct {
 		name   string
-		value  interface{}
+		value  any
 		option *option
 	}
 
@@ -454,14 +453,14 @@ func (c *Config) LoadMap(options map[string]interface{}, force ...bool) error {
 }
 
 // Parse parses the option value named name, and returns it.
-func (c *Config) Parse(name string, value interface{}) (interface{}, error) {
+func (c *Config) Parse(name string, value any) (any, error) {
 	name = c.fixOptionName(name)
 	_, value, err := c.updateOpt(name, value, false)
 	return value, err
 }
 
 // Set is used to reset the option named name to value.
-func (c *Config) Set(name string, value interface{}) (err error) {
+func (c *Config) Set(name string, value any) (err error) {
 	name = c.fixOptionName(name)
 	_, _, err = c.updateOpt(name, value, true)
 	if err == ErrNoOpt && c.ignore {
@@ -473,7 +472,7 @@ func (c *Config) Set(name string, value interface{}) (err error) {
 // Get returns the value of the option named name.
 //
 // Return nil if this option does not exist.
-func (c *Config) Get(name string) (value interface{}) {
+func (c *Config) Get(name string) (value any) {
 	name = c.fixOptionName(name)
 	if opt, ok := c.options[name]; ok {
 		value = opt.Get()
@@ -486,7 +485,7 @@ func (c *Config) Get(name string) (value interface{}) {
 }
 
 // Must is the same as Get, but panic if the returned value is nil.
-func (c *Config) Must(name string) (value interface{}) {
+func (c *Config) Must(name string) (value any) {
 	if value = c.Get(name); value == nil {
 		panic(fmt.Errorf("no option named name '%s'", name))
 	}

config_test.go

@@ -109,7 +109,7 @@ func TestConfig(t *testing.T) {
 		t.Errorf("durations option value expects '%v', but got '%v'", []time.Duration{}, v)
 	}
 
-	_ = LoadMap(map[string]interface{}{
+	_ = LoadMap(map[string]any{
 		"bool":      true,
 		"string":    "abc",
 		"int":       111,
@@ -195,12 +195,12 @@ func TestConfig_Observe(t *testing.T) {
 	Conf.reset()
 	type option struct {
 		name string
-		old  interface{}
-		new  interface{}
+		old  any
+		new  any
 	}
 
 	var options []option
-	Observe(func(name string, old, new interface{}) {
+	Observe(func(name string, old, new any) {
 		options = append(options, option{name: name, old: old, new: new})
 	})
 

decoder.go

@@ -23,7 +23,7 @@ import (
 )
 
 // Decoder is used to decode the configuration data.
-type Decoder func(src []byte, dst map[string]interface{}) error
+type Decoder func(src []byte, dst map[string]any) error
 
 // AddDecoder is equal to Conf.AddDecoder(_type, decoder).
 func AddDecoder(_type string, decoder Decoder) {
@@ -71,7 +71,7 @@ func (c *Config) AddDecoderTypeAliases(_type string, aliases ...string) {
 func NewJSONDecoder() Decoder {
 	comment := []byte("//")
 	newline := []byte("\n")
-	return func(src []byte, dst map[string]interface{}) (err error) {
+	return func(src []byte, dst map[string]any) (err error) {
 		if bytes.Contains(src, comment) {
 			buf := bytes.NewBuffer(nil)
 			buf.Grow(len(src))
@@ -109,7 +109,7 @@ func NewIniDecoder(defaultGroupName ...string) Decoder {
 		defaultGroup = defaultGroupName[0]
 	}
 
-	return func(src []byte, dst map[string]interface{}) (err error) {
+	return func(src []byte, dst map[string]any) (err error) {
 		var gname string
 		lines := strings.Split(string(src), "\n")
 		for index, maxIndex := 0, len(lines); index < maxIndex; {

decoder_test.go

@@ -29,7 +29,7 @@ func ExampleNewJSONDecoder() {
 		}
 	}`)
 
-	ms := make(map[string]interface{})
+	ms := make(map[string]any)
 	err := NewJSONDecoder()(data, ms)
 
 	fmt.Println(err)

global.go

@@ -34,23 +34,23 @@ func LoadBackupFile(filename string) error {
 }
 
 // Snapshot is equal to Conf.Snapshot().
-func Snapshot() (generation uint64, snap map[string]interface{}) {
+func Snapshot() (generation uint64, snap map[string]any) {
 	return Conf.Snapshot()
 }
 
 // LoadMap is equal to Conf.LoadMap(options, force...).
-func LoadMap(options map[string]interface{}, force ...bool) error {
+func LoadMap(options map[string]any, force ...bool) error {
 	return Conf.LoadMap(options)
 }
 
 // Set is equal to Conf.Set(name, value).
-func Set(name string, value interface{}) error { return Conf.Set(name, value) }
+func Set(name string, value any) error { return Conf.Set(name, value) }
 
 // Get is equal to Conf.Get(name).
-func Get(name string) interface{} { return Conf.Get(name) }
+func Get(name string) any { return Conf.Get(name) }
 
 // Must is equal to Conf.Must(name).
-func Must(name string) interface{} { return Conf.Must(name) }
+func Must(name string) any { return Conf.Must(name) }
 
 // Observe is equal to Conf.Observe(observers...).
 func Observe(observers ...Observer) { Conf.Observe(observers...) }