Skip to content

Commit 17d50fd

Browse files
committed
chore(deps): update dependencies
1 parent 74f9921 commit 17d50fd

File tree

11 files changed

+39
-38
lines changed

11 files changed

+39
-38
lines changed

collects.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
func (e *Endure) collects() error {
88
vertices := e.graph.TopologicalOrder()
99

10-
for i := 0; i < len(vertices); i++ {
10+
for i := range vertices {
1111
if !vertices[i].IsActive() {
1212
continue
1313
}
@@ -20,13 +20,13 @@ func (e *Endure) collects() error {
2020
collects := vertices[i].Plugin().(Collector).Collects()
2121

2222
// get vals
23-
for j := 0; j < len(collects); j++ {
23+
for j := range collects {
2424
impl := e.registar.ImplementsExcept(collects[j].Type, vertices[i].Plugin())
2525
if len(impl) == 0 {
2626
continue
2727
}
2828

29-
for k := 0; k < len(impl); k++ {
29+
for k := range impl {
3030
value, ok := e.registar.TypeValue(impl[k].Plugin(), collects[j].Type)
3131
if !ok {
3232
return errors.E("this is likely a bug, nil value from the implements. Value should be initialized due to the topological order")

dep/out.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func Bind(tp any, method any) *Out {
2727
panic("second argument should be a function")
2828
}
2929

30-
for i := 0; i < r.NumOut(); i++ {
30+
for i := range r.NumOut() {
3131
// skip errors
3232
if r.Out(i) == reflect.TypeOf((*error)(nil)).Elem() {
3333
continue

edges.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ func (e *Endure) resolveCollectorEdges(plugin any) error {
1515
// retrieve the needed dependencies via Collects
1616
inEntries := collector.Collects()
1717

18-
for i := 0; i < len(inEntries); i++ {
18+
for i := range inEntries {
1919
res := e.registar.ImplementsExcept(inEntries[i].Type, plugin)
2020
if len(res) > 0 {
21-
for j := 0; j < len(res); j++ {
21+
for j := range res {
2222
e.graph.AddEdge(graph.CollectsConnection, res[j].Plugin(), plugin)
2323
e.log.Debug("collects edge found",
2424
zap.String("method", res[j].Method()),
@@ -36,15 +36,15 @@ func (e *Endure) resolveCollectorEdges(plugin any) error {
3636
func (e *Endure) resolveEdges() error {
3737
vertices := e.graph.Vertices()
3838

39-
for i := 0; i < len(vertices); i++ {
39+
for i := range vertices {
4040
vertex := e.graph.VertexById(vertices[i].Plugin())
4141
initMethod, ok := vertex.ID().MethodByName(InitMethodName)
4242
if !ok {
4343
return errors.E("plugin should have the `Init(...) error` method")
4444
}
4545

4646
args := make([]reflect.Type, initMethod.Type.NumIn())
47-
for j := 0; j < initMethod.Type.NumIn(); j++ {
47+
for j := range initMethod.Type.NumIn() {
4848
if isPrimitive(initMethod.Type.In(j).String()) {
4949
e.log.Error(
5050
"primitive type in the function parameters",
@@ -72,7 +72,7 @@ func (e *Endure) resolveEdges() error {
7272
res := e.registar.ImplementsExcept(args[j], vertices[i].Plugin())
7373
if len(res) > 0 {
7474
count += 1
75-
for k := 0; k < len(res); k++ {
75+
for k := range res {
7676
// add graph edge
7777
e.graph.AddEdge(graph.InitConnection, res[k].Plugin(), vertex.Plugin())
7878
// log
@@ -89,7 +89,7 @@ func (e *Endure) resolveEdges() error {
8989
if count != len(args[1:]) {
9090
// if there are no plugins that implement Init deps, remove this vertex from the tree
9191
del := e.graph.Remove(vertices[i].Plugin())
92-
for k := 0; k < len(del); k++ {
92+
for k := range del {
9393
e.registar.Remove(del[k].Plugin())
9494
e.log.Debug(
9595
"plugin disabled, not enough Init dependencies",

endure.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (e *Endure) Register(vertex any) error {
135135
outDeps := val.Provides()
136136

137137
// iter
138-
for i := 0; i < len(outDeps); i++ {
138+
for i := range outDeps {
139139
e.registar.Insert(vertex, outDeps[i].Type, outDeps[i].Method, weight)
140140
e.log.Debug(
141141
"provided type registered",
@@ -237,7 +237,7 @@ func (e *Endure) Plugins() []string {
237237
v := e.graph.TopologicalOrder()
238238
plugins := make([]string, 0, len(v))
239239

240-
for i := 0; i < len(v); i++ {
240+
for i := range v {
241241
if !v[i].IsActive() {
242242
continue
243243
}

graph/graph.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"os"
66
"reflect"
7+
"slices"
78
"strings"
89
)
910

@@ -100,7 +101,7 @@ func (g *Graph) Remove(plugin any) []*Vertex {
100101
}
101102

102103
edges := vertex.edges
103-
for i := 0; i < len(edges); i++ {
104+
for i := range edges {
104105
if _, ok := g.vertices[reflect.TypeOf(edges[i].dest)]; !ok {
105106
continue
106107
}
@@ -112,7 +113,7 @@ func (g *Graph) Remove(plugin any) []*Vertex {
112113

113114
args := make([]reflect.Type, initMethod.Type.NumIn())
114115
// receiver + other (should be other, since this is a dest vertex)
115-
for j := 0; j < initMethod.Type.NumIn(); j++ {
116+
for j := range initMethod.Type.NumIn() {
116117
args[j] = initMethod.Type.In(j)
117118
}
118119

@@ -127,13 +128,13 @@ func (g *Graph) Remove(plugin any) []*Vertex {
127128
continue
128129
}
129130

130-
for j := 0; j < len(args); j++ {
131+
for j := range args {
131132
if reflect.TypeOf(v.Plugin()).Implements(args[j]) {
132133
/*
133134
we've found a plugin which may replace our dependency
134135
now, since we modified the slice, start iteration again
135136
*/
136-
args = append(args[:j], args[j+1:]...)
137+
args = slices.Delete(args, j, j+1)
137138
goto retry
138139
}
139140
}
@@ -154,15 +155,15 @@ func (g *Graph) Remove(plugin any) []*Vertex {
154155

155156
// remove all edges where dest is our plugin prepared to delete
156157
for _, v := range g.vertices {
157-
for i := 0; i < len(v.edges); i++ {
158+
for i := range v.edges {
158159
if v.edges[i].dest == plugin {
159-
v.edges = append(v.edges[:i], v.edges[i+1:]...)
160+
v.edges = slices.Delete(v.edges, i, i+1)
160161
}
161162
}
162163
}
163164

164-
for i := 0; i < len(g.topologicalOrder); i++ {
165-
for j := 0; j < len(deletedVertices); j++ {
165+
for i := range g.topologicalOrder {
166+
for j := range deletedVertices {
166167
if g.topologicalOrder[i] == deletedVertices[j] {
167168
g.topologicalOrder[i].active = false
168169
}
@@ -179,8 +180,8 @@ func (g *Graph) WriteDotString() {
179180
s.WriteString("\tgraph [compound=true];\n")
180181

181182
seenEdges := make(map[string]struct{})
182-
for i := 0; i < len(g.topologicalOrder); i++ {
183-
for j := 0; j < len(g.topologicalOrder[i].edges); j++ {
183+
for i := range g.topologicalOrder {
184+
for j := range g.topologicalOrder[i].edges {
184185
src := reflect.TypeOf(g.topologicalOrder[i].edges[j].src).String()
185186
dest := reflect.TypeOf(g.topologicalOrder[i].edges[j].dest).String()
186187

graph/heap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ func (h *VertexHeap) Swap(i, j int) {
1717
(*h)[i], (*h)[j] = (*h)[j], (*h)[i]
1818
}
1919

20-
func (h *VertexHeap) Push(x interface{}) {
20+
func (h *VertexHeap) Push(x any) {
2121
*h = append(*h, x.(*Vertex))
2222
heap.Fix(h, len(*h)-1)
2323
}
2424

25-
func (h *VertexHeap) Pop() interface{} {
25+
func (h *VertexHeap) Pop() any {
2626
n := len(*h)
2727
x := (*h)[n-1]
2828
*h = (*h)[0 : n-1]

graph/toposort.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (g *Graph) TopologicalSort() {
2424

2525
// Decrement the indegree of each of the vertex's neighbors.
2626
// If a neighbor's indegree becomes 0, add it to the priority queue.
27-
for i := 0; i < len(v.edges); i++ {
27+
for i := range v.edges {
2828
dest := g.VertexById(v.edges[i].dest)
2929
dest.indegree--
3030

init.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ func (e *Endure) init() error {
1717
return errors.E(errors.Str("error occurred, nothing to run"))
1818
}
1919

20-
for i := 0; i < len(vertices); i++ {
20+
for i := range vertices {
2121
if !vertices[i].IsActive() {
2222
continue
2323
}
2424

2525
initMethod, _ := reflect.TypeOf(vertices[i].Plugin()).MethodByName(InitMethodName)
2626

2727
args := make([]reflect.Type, initMethod.Type.NumIn())
28-
for j := 0; j < initMethod.Type.NumIn(); j++ {
28+
for j := range initMethod.Type.NumIn() {
2929
args[j] = initMethod.Type.In(j)
3030
}
3131

@@ -35,11 +35,11 @@ func (e *Endure) init() error {
3535
if len(args) > 1 {
3636
// exclude first arg (its receiver)
3737
arg := args[1:]
38-
for j := 0; j < len(arg); j++ {
38+
for j := range arg {
3939
plugin := e.registar.ImplementsExcept(arg[j], vertices[i].Plugin())
4040
if len(plugin) == 0 {
4141
del := e.graph.Remove(vertices[i].Plugin())
42-
for k := 0; k < len(del); k++ {
42+
for k := range del {
4343
e.registar.Remove(del[k].Plugin())
4444
e.log.Debug(
4545
"plugin disabled, not enough Init dependencies",
@@ -97,7 +97,7 @@ func (e *Endure) init() error {
9797
// delete vertex and continue
9898
plugins := e.graph.Remove(vertices[i].Plugin())
9999

100-
for j := 0; j < len(plugins); j++ {
100+
for j := range plugins {
101101
e.log.Debug(
102102
"destination plugin disabled because root was disabled",
103103
zap.String("name", plugins[j].ID().String()),
@@ -120,7 +120,7 @@ func (e *Endure) init() error {
120120

121121
if provider, ok := vertices[i].Plugin().(Provider); ok {
122122
out := provider.Provides()
123-
for j := 0; j < len(out); j++ {
123+
for j := range out {
124124
providesMethod, okk := reflect.TypeOf(vertices[i].Plugin()).MethodByName(out[j].Method)
125125
if !okk {
126126
e.log.Warn("registered method doesn't exists ??")
@@ -143,7 +143,7 @@ func (e *Endure) init() error {
143143
}
144144

145145
inactive := 0
146-
for i := 0; i < len(vertices); i++ {
146+
for i := range vertices {
147147
if !vertices[i].IsActive() {
148148
inactive++
149149
}

registar/registar.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (r *Registar) Update(plugin any, tp reflect.Type, value func() reflect.Valu
4141
// returned types
4242
types := r.types[key].returnedTypes
4343

44-
for i := 0; i < len(types); i++ {
44+
for i := range types {
4545
if types[i].retType == tp {
4646
types[i].value = value
4747
}
@@ -56,7 +56,7 @@ func (r *Registar) Value(plugin any, tp reflect.Type) (reflect.Value, bool) {
5656
// returned types
5757
types := r.types[key].returnedTypes
5858

59-
for i := 0; i < len(types); i++ {
59+
for i := range types {
6060
if types[i].retType == tp {
6161
return types[i].value(), true
6262
}
@@ -75,7 +75,7 @@ func (r *Registar) TypeValue(plugin any, tp reflect.Type) (reflect.Value, bool)
7575

7676
retTp := r.types[key]
7777

78-
for i := 0; i < len(retTp.returnedTypes); i++ {
78+
for i := range retTp.returnedTypes {
7979
if retTp.returnedTypes[i].retType.Implements(tp) {
8080
if retTp.returnedTypes[i].value == nil {
8181
return reflect.Value{}, false
@@ -114,7 +114,7 @@ func (r *Registar) ImplementsExcept(tp reflect.Type, plugin any) []*implements {
114114
}
115115

116116
// here we check that provides
117-
for j := 0; j < len(entry.returnedTypes); j++ {
117+
for j := range entry.returnedTypes {
118118
provided := entry.returnedTypes[j]
119119
if provided.retType.Implements(tp) {
120120
impl = append(impl,

serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (e *Endure) serve() error {
2525
return errors.E(errors.Str("error occurred, nothing to run"))
2626
}
2727

28-
for i := 0; i < len(serveVertices); i++ {
28+
for i := range serveVertices {
2929
if !serveVertices[i].IsActive() {
3030
continue
3131
}

0 commit comments

Comments
 (0)