mirror of
https://github.com/zeromicro/go-zero.git
synced 2026-05-14 18:30:02 +08:00
refactor(core): replace TakeOne usage with cmp.Or (#5461)
Co-authored-by: 1911860538 <alxps1911@gmail.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package mapping
|
package mapping
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"cmp"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -12,7 +13,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/lang"
|
"github.com/zeromicro/go-zero/core/lang"
|
||||||
"github.com/zeromicro/go-zero/core/stringx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -278,7 +278,7 @@ func parseKeyAndOptions(tagName string, field reflect.StructField) (string, *fie
|
|||||||
cache, ok := optionsCache[value]
|
cache, ok := optionsCache[value]
|
||||||
cacheLock.RUnlock()
|
cacheLock.RUnlock()
|
||||||
if ok {
|
if ok {
|
||||||
return stringx.TakeOne(cache.key, field.Name), cache.options, cache.err
|
return cmp.Or(cache.key, field.Name), cache.options, cache.err
|
||||||
}
|
}
|
||||||
|
|
||||||
key, options, err := doParseKeyAndOptions(field, value)
|
key, options, err := doParseKeyAndOptions(field, value)
|
||||||
@@ -290,7 +290,7 @@ func parseKeyAndOptions(tagName string, field reflect.StructField) (string, *fie
|
|||||||
}
|
}
|
||||||
cacheLock.Unlock()
|
cacheLock.Unlock()
|
||||||
|
|
||||||
return stringx.TakeOne(key, field.Name), options, err
|
return cmp.Or(key, field.Name), options, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// support below notations:
|
// support below notations:
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ func Substr(str string, start, stop int) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TakeOne returns valid string if not empty or later one.
|
// TakeOne returns valid string if not empty or later one.
|
||||||
|
// Deprecated: use cmp.Or instead.
|
||||||
func TakeOne(valid, or string) string {
|
func TakeOne(valid, or string) string {
|
||||||
if len(valid) > 0 {
|
if len(valid) > 0 {
|
||||||
return valid
|
return valid
|
||||||
|
|||||||
Reference in New Issue
Block a user