zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: change interface{} to any (#2818)

Browse Source 
* chore: change interface{} to any

* chore: update goctl version to 1.5.0

* chore: update goctl deps
This commit is contained in:
Kevin Wan
2023-01-24 16:32:02 +08:00
committed by GitHub
parent 7e0ac77139
commit ae87114282
221 changed files with 1910 additions and 2207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/goctl/pkg/collection/sortedmap.go
View File

@@ -14,21 +14,21 @@ var (
ErrInvalidKVS = errors.New("the length of kv must be an even number")
)
type KV []interface{}
type KV []any
type SortedMap struct {
kv *list.List
keys map[interface{}]*list.Element
keys map[any]*list.Element
}
func New() *SortedMap {
return &SortedMap{
kv: list.New(),
keys: make(map[interface{}]*list.Element),
keys: make(map[any]*list.Element),
}
}
func (m *SortedMap) SetExpression(expression string) (key, value interface{}, err error) {
func (m *SortedMap) SetExpression(expression string) (key, value any, err error) {
idx := strings.Index(expression, "=")
if idx == -1 {
return "", "", ErrInvalidKVExpression
@@ -53,7 +53,7 @@ func (m *SortedMap) SetExpression(expression string) (key, value interface{}, er
return
}
func (m *SortedMap) SetKV(key, value interface{}) {
func (m *SortedMap) SetKV(key, value any) {
e, ok := m.keys[key]
if !ok {
e = m.kv.PushBack(KV{
@@ -78,7 +78,7 @@ func (m *SortedMap) Set(kv KV) error {
return nil
}
func (m *SortedMap) Get(key interface{}) (interface{}, bool) {
func (m *SortedMap) Get(key any) (any, bool) {
e, ok := m.keys[key]
if !ok {
return nil, false
@@ -86,7 +86,7 @@ func (m *SortedMap) Get(key interface{}) (interface{}, bool) {
return e.Value.(KV)[1], true
}
func (m *SortedMap) GetOr(key, dft interface{}) interface{} {
func (m *SortedMap) GetOr(key, dft any) any {
e, ok := m.keys[key]
if !ok {
return dft
@@ -94,7 +94,7 @@ func (m *SortedMap) GetOr(key, dft interface{}) interface{} {
return e.Value.(KV)[1]
}
func (m *SortedMap) GetString(key interface{}) (string, bool) {
func (m *SortedMap) GetString(key any) (string, bool) {
value, ok := m.Get(key)
if !ok {
return "", false
@@ -103,7 +103,7 @@ func (m *SortedMap) GetString(key interface{}) (string, bool) {
return vs, ok
}
func (m *SortedMap) GetStringOr(key interface{}, dft string) string {
func (m *SortedMap) GetStringOr(key any, dft string) string {
value, ok := m.GetString(key)
if !ok {
return dft
@@ -111,14 +111,14 @@ func (m *SortedMap) GetStringOr(key interface{}, dft string) string {
return value
}
func (m *SortedMap) HasKey(key interface{}) bool {
func (m *SortedMap) HasKey(key any) bool {
_, ok := m.keys[key]
return ok
}
func (m *SortedMap) HasValue(value interface{}) bool {
func (m *SortedMap) HasValue(value any) bool {
var contains bool
m.RangeIf(func(key, v interface{}) bool {
m.RangeIf(func(key, v any) bool {
if value == v {
contains = true
return false
@@ -128,8 +128,8 @@ func (m *SortedMap) HasValue(value interface{}) bool {
return contains
}
func (m *SortedMap) Keys() []interface{} {
keys := make([]interface{}, 0)
func (m *SortedMap) Keys() []any {
keys := make([]any, 0)
next := m.kv.Front()
for next != nil {
keys = append(keys, next.Value.(KV)[0])
@@ -138,16 +138,16 @@ func (m *SortedMap) Keys() []interface{} {
return keys
}
func (m *SortedMap) Values() []interface{} {
func (m *SortedMap) Values() []any {
keys := m.Keys()
values := make([]interface{}, len(keys))
values := make([]any, len(keys))
for idx, key := range keys {
values[idx] = m.keys[key].Value.(KV)[1]
}
return values
}
func (m *SortedMap) Range(iterator func(key, value interface{})) {
func (m *SortedMap) Range(iterator func(key, value any)) {
next := m.kv.Front()
for next != nil {
value := next.Value.(KV)
@@ -156,7 +156,7 @@ func (m *SortedMap) Range(iterator func(key, value interface{})) {
}
}
func (m *SortedMap) RangeIf(iterator func(key, value interface{}) bool) {
func (m *SortedMap) RangeIf(iterator func(key, value any) bool) {
next := m.kv.Front()
for next != nil {
value := next.Value.(KV)
@@ -168,7 +168,7 @@ func (m *SortedMap) RangeIf(iterator func(key, value interface{}) bool) {
}
}
func (m *SortedMap) Remove(key interface{}) (value interface{}, ok bool) {
func (m *SortedMap) Remove(key any) (value any, ok bool) {
v, ok := m.keys[key]
if !ok {
return nil, false
@@ -181,14 +181,14 @@ func (m *SortedMap) Remove(key interface{}) (value interface{}, ok bool) {
}
func (m *SortedMap) Insert(sm *SortedMap) {
sm.Range(func(key, value interface{}) {
sm.Range(func(key, value any) {
m.SetKV(key, value)
})
}
func (m *SortedMap) Copy() *SortedMap {
sm := New()
m.Range(func(key, value interface{}) {
m.Range(func(key, value any) {
sm.SetKV(key, value)
})
return sm
@@ -196,7 +196,7 @@ func (m *SortedMap) Copy() *SortedMap {
func (m *SortedMap) Format() []string {
format := make([]string, 0)
m.Range(func(key, value interface{}) {
m.Range(func(key, value any) {
format = append(format, fmt.Sprintf("%s=%s", key, value))
})
return format

8
tools/goctl/pkg/collection/sortedmap_test.go
View File

@@ -142,7 +142,7 @@ func Test_SortedMap(t *testing.T) {
t.Run("Range", func(t *testing.T) {
var keys, values []string
sm.Range(func(key, value interface{}) {
sm.Range(func(key, value any) {
keys = append(keys, key.(string))
values = append(values, value.(string))
})
@@ -153,7 +153,7 @@ func Test_SortedMap(t *testing.T) {
for _, key := range expected {
sm.SetKV(key, key)
}
sm.Range(func(key, value interface{}) {
sm.Range(func(key, value any) {
keys = append(keys, key.(string))
values = append(values, value.(string))
})
@@ -164,7 +164,7 @@ func Test_SortedMap(t *testing.T) {
t.Run("RangeIf", func(t *testing.T) {
var keys, values []string
sm.RangeIf(func(key, value interface{}) bool {
sm.RangeIf(func(key, value any) bool {
keys = append(keys, key.(string))
values = append(values, value.(string))
return true
@@ -176,7 +176,7 @@ func Test_SortedMap(t *testing.T) {
for _, key := range expected {
sm.SetKV(key, key)
}
sm.RangeIf(func(key, value interface{}) bool {
sm.RangeIf(func(key, value any) bool {
keys = append(keys, key.(string))
values = append(values, value.(string))
if key.(string) == "foo1" {

2
tools/goctl/pkg/env/env.go vendored
View File

@@ -122,7 +122,7 @@ func WriteEnv(kv []string) error {
return err
}
}
data.RangeIf(func(key, value interface{}) bool {
data.RangeIf(func(key, value any) bool {
switch key.(string) {
case GoctlHome, GoctlCache:
path := value.(string)