build: modernize Go usage
This commit modernizes Go usage. This was done with:
go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...
Then files needed to be `go fmt`ed and a few comments needed to be
restored.
The modernizations include replacing
- if/else conditional assignment by a call to the built-in min or max functions added in go1.21
- sort.Slice(x, func(i, j int) bool) { return s[i] < s[j] } by a call to slices.Sort(s), added in go1.21
- interface{} by the 'any' type added in go1.18
- append([]T(nil), s...) by slices.Clone(s) or slices.Concat(s), added in go1.21
- loop around an m[k]=v map update by a call to one of the Collect, Copy, Clone, or Insert functions from the maps package, added in go1.21
- []byte(fmt.Sprintf...) by fmt.Appendf(nil, ...), added in go1.19
- append(s[:i], s[i+1]...) by slices.Delete(s, i, i+1), added in go1.21
- a 3-clause for i := 0; i < n; i++ {} loop by for i := range n {}, added in go1.22
This commit is contained in:
@@ -77,7 +77,7 @@ func (h *CallerHook) Fire(entry *logrus.Entry) error {
|
||||
func findCaller(skip int) string {
|
||||
file := ""
|
||||
line := 0
|
||||
for i := 0; i < 10; i++ {
|
||||
for i := range 10 {
|
||||
file, line = getCaller(skip + i)
|
||||
if !strings.HasPrefix(file, "logrus") && !strings.Contains(file, "log.go") {
|
||||
break
|
||||
|
||||
+4
-4
@@ -78,13 +78,13 @@ func fnName() string {
|
||||
// function that logs the exit parameters.
|
||||
//
|
||||
// Any pointers in the exit function will be dereferenced
|
||||
func Trace(o interface{}, format string, a ...interface{}) func(string, ...interface{}) {
|
||||
func Trace(o any, format string, a ...any) func(string, ...any) {
|
||||
if fs.GetConfig(context.Background()).LogLevel < fs.LogLevelDebug {
|
||||
return func(format string, a ...interface{}) {}
|
||||
return func(format string, a ...any) {}
|
||||
}
|
||||
name := fnName()
|
||||
fs.LogPrintf(fs.LogLevelDebug, o, name+": "+format, a...)
|
||||
return func(format string, a ...interface{}) {
|
||||
return func(format string, a ...any) {
|
||||
for i := range a {
|
||||
// read the values of the pointed to items
|
||||
typ := reflect.TypeOf(a[i])
|
||||
@@ -103,7 +103,7 @@ func Trace(o interface{}, format string, a ...interface{}) func(string, ...inter
|
||||
}
|
||||
|
||||
// Stack logs a stack trace of callers with the o and info passed in
|
||||
func Stack(o interface{}, info string) {
|
||||
func Stack(o any, info string) {
|
||||
if fs.GetConfig(context.Background()).LogLevel < fs.LogLevelDebug {
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user