From 79d3c2bfd95c5cb0ac6e4a3f97156161d792c676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.eu>
Date: Sun, 24 Apr 2022 18:53:32 +0200
Subject: Replace `interface{}` by `any`

---
 pkg/config/body.go       |  4 ++--
 pkg/config/config.go     |  6 +++---
 pkg/config/deprecated.go |  6 +++---
 pkg/log/log.go           | 16 ++++++++--------
 pkg/util/util.go         |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'pkg')

diff --git a/pkg/config/body.go b/pkg/config/body.go
index 3b2f676..17cf924 100644
--- a/pkg/config/body.go
+++ b/pkg/config/body.go
@@ -22,7 +22,7 @@ func (b *Body) UnmarshalYAML(node *yaml.Node) error {
 		val = "default"
 	}
 
-	if !util.StrContains(validBody, val) {
+	if !util.Contains(validBody, val) {
 		return TypeError("line %d: Invalid value for 'body': %q", node.Line, val)
 	}
 
@@ -30,6 +30,6 @@ func (b *Body) UnmarshalYAML(node *yaml.Node) error {
 	return nil
 }
 
-func TypeError(format string, v ...interface{}) *yaml.TypeError {
+func TypeError(format string, v ...any) *yaml.TypeError {
 	return &yaml.TypeError{Errors: []string{fmt.Sprintf(format, v...)}}
 }
diff --git a/pkg/config/config.go b/pkg/config/config.go
index a580337..a7c540f 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -13,7 +13,7 @@ import (
 
 // Map is a convenience type for the non-mapped configuration options
 // Mostly used for legacy options
-type Map map[string]interface{}
+type Map map[string]any
 
 // GlobalOptions are not feed specific
 type GlobalOptions struct {
@@ -108,12 +108,12 @@ func (cfg *Config) Validate() error {
 
 // WithPartText marks whether 'text' part should be included in mails
 func (opt GlobalOptions) WithPartText() bool {
-	return util.StrContains(opt.Parts, "text")
+	return util.Contains(opt.Parts, "text")
 }
 
 // WithPartHtml marks whether 'html' part should be included in mails
 func (opt GlobalOptions) WithPartHtml() bool {
-	return util.StrContains(opt.Parts, "html")
+	return util.Contains(opt.Parts, "html")
 }
 
 // Load configuration from file and validate it
diff --git a/pkg/config/deprecated.go b/pkg/config/deprecated.go
index 44ed6f6..f373d5e 100644
--- a/pkg/config/deprecated.go
+++ b/pkg/config/deprecated.go
@@ -8,7 +8,7 @@ import (
 
 type deprecated struct {
 	msg    string
-	handle func(interface{}, *GlobalOptions, *Options)
+	handle func(any, *GlobalOptions, *Options)
 }
 
 var unsupported = deprecated{
@@ -21,7 +21,7 @@ var deprecatedOpts = map[string]deprecated{
 	"debug-updated": {"Use '-d' as option instead.", nil},
 	"execurl":       {"Use 'exec' instead.", nil},
 	"filter":        {"Use 'item-filter' instead.", nil},
-	"disable-ssl-verification": {"Interpreted as 'tls-no-verify'.", func(i interface{}, global *GlobalOptions, opts *Options) {
+	"disable-ssl-verification": {"Interpreted as 'tls-no-verify'.", func(i any, global *GlobalOptions, opts *Options) {
 		if val, ok := i.(bool); ok {
 			if val && !opts.NoTLS {
 				// do not overwrite the set NoTLS flag!
@@ -33,7 +33,7 @@ var deprecatedOpts = map[string]deprecated{
 	}},
 }
 
-func handleDeprecated(option string, value interface{}, feed string, global *GlobalOptions, opts *Options) bool {
+func handleDeprecated(option string, value any, feed string, global *GlobalOptions, opts *Options) bool {
 	dep, ok := deprecatedOpts[option]
 	if !ok {
 		return false
diff --git a/pkg/log/log.go b/pkg/log/log.go
index b68d026..794cd09 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -33,45 +33,45 @@ func IsDebug() bool {
 	return level == debug
 }
 
-func Debug(v ...interface{}) {
+func Debug(v ...any) {
 	if level <= debug {
 		_ = debugLogger.Output(2, fmt.Sprint(v...))
 	}
 }
 
-func Debugf(format string, v ...interface{}) {
+func Debugf(format string, v ...any) {
 	if level <= debug {
 		_ = debugLogger.Output(2, fmt.Sprintf(format, v...))
 	}
 }
 
-func Print(v ...interface{}) {
+func Print(v ...any) {
 	if level <= info {
 		_ = verboseLogger.Output(2, fmt.Sprint(v...))
 	}
 }
 
-func Printf(format string, v ...interface{}) {
+func Printf(format string, v ...any) {
 	if level <= info {
 		_ = verboseLogger.Output(2, fmt.Sprintf(format, v...))
 	}
 }
 
-func Error(v ...interface{}) {
+func Error(v ...any) {
 	_ = errorLogger.Output(2, fmt.Sprint(v...))
 }
 
 //noinspection GoUnusedExportedFunction
-func Errorf(format string, a ...interface{}) {
+func Errorf(format string, a ...any) {
 	_ = errorLogger.Output(2, fmt.Sprintf(format, a...))
 }
 
 //noinspection GoUnusedExportedFunction
-func Warn(v ...interface{}) {
+func Warn(v ...any) {
 	_ = warnLogger.Output(2, fmt.Sprint(v...))
 }
 
 //noinspection GoUnusedExportedFunction
-func Warnf(format string, a ...interface{}) {
+func Warnf(format string, a ...any) {
 	_ = warnLogger.Output(2, fmt.Sprintf(format, a...))
 }
diff --git a/pkg/util/util.go b/pkg/util/util.go
index bacb494..cbc6014 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -2,8 +2,8 @@ package util
 
 import "time"
 
-// StrContains searches for `needle` in `haystack` and returns `true` if found.
-func StrContains(haystack []string, needle string) bool {
+// Contains searches for `needle` in `haystack` and returns `true` if found.
+func Contains[T comparable](haystack []T, needle T) bool {
 	for _, s := range haystack {
 		if s == needle {
 			return true
-- 
cgit v1.2.3