chore: style fixes from go fix (#10846)
Just `go fix ./...` Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
@@ -18,23 +18,23 @@ import (
|
||||
|
||||
type Registry struct {
|
||||
mut sync.Mutex
|
||||
available map[string][]interface{}
|
||||
available map[string][]any
|
||||
}
|
||||
|
||||
func New() *Registry {
|
||||
return &Registry{
|
||||
available: make(map[string][]interface{}),
|
||||
available: make(map[string][]any),
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Registry) Register(scheme string, item interface{}) {
|
||||
func (r *Registry) Register(scheme string, item any) {
|
||||
r.mut.Lock()
|
||||
defer r.mut.Unlock()
|
||||
|
||||
r.available[scheme] = append(r.available[scheme], item)
|
||||
}
|
||||
|
||||
func (r *Registry) Unregister(scheme string, item interface{}) {
|
||||
func (r *Registry) Unregister(scheme string, item any) {
|
||||
r.mut.Lock()
|
||||
defer r.mut.Unlock()
|
||||
|
||||
@@ -49,12 +49,12 @@ func (r *Registry) Unregister(scheme string, item interface{}) {
|
||||
|
||||
// Get returns an item for a schema compatible with the given scheme.
|
||||
// If any item satisfies preferred, that has precedence over other items.
|
||||
func (r *Registry) Get(scheme string, preferred func(interface{}) bool) interface{} {
|
||||
func (r *Registry) Get(scheme string, preferred func(any) bool) any {
|
||||
r.mut.Lock()
|
||||
defer r.mut.Unlock()
|
||||
|
||||
var (
|
||||
best interface{}
|
||||
best any
|
||||
bestPref bool
|
||||
bestScheme string
|
||||
)
|
||||
|
||||
@@ -14,8 +14,8 @@ import (
|
||||
func TestRegistry(t *testing.T) {
|
||||
r := New()
|
||||
|
||||
want := func(i int) func(interface{}) bool {
|
||||
return func(x interface{}) bool { return x.(int) == i }
|
||||
want := func(i int) func(any) bool {
|
||||
return func(x any) bool { return x.(int) == i }
|
||||
}
|
||||
|
||||
if res := r.Get("int", want(1)); res != nil {
|
||||
@@ -73,7 +73,7 @@ func TestShortSchemeFirst(t *testing.T) {
|
||||
r.Register("foobar", 1)
|
||||
|
||||
// If we don't care about the value, we should get the one with "foo".
|
||||
res := r.Get("foo", func(interface{}) bool { return false })
|
||||
res := r.Get("foo", func(any) bool { return false })
|
||||
if res != 0 {
|
||||
t.Error("unexpected", res)
|
||||
}
|
||||
@@ -89,7 +89,7 @@ func BenchmarkGet(b *testing.B) {
|
||||
b.ResetTimer()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
r.Get("tcp", func(x interface{}) bool {
|
||||
r.Get("tcp", func(x any) bool {
|
||||
return x.(*net.TCPAddr).IP.IsUnspecified()
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user