Skip to content

Commit

Permalink
routing: preallocate slices (#2787)
Browse files Browse the repository at this point in the history
Preallocate cases (except in *_test.go) found by https://github.com/alexkohler/prealloc

Signed-off-by: Alexander Yastrebov <[email protected]>
  • Loading branch information
AlexanderYastrebov authored Dec 11, 2023
1 parent 7b1101b commit 2239849
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
10 changes: 3 additions & 7 deletions routing/datasource.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,10 @@ func mergeDefs(defsByClient map[DataClient]routeDefs) []*eskip.Route {
}
}

var all []*eskip.Route
all := make([]*eskip.Route, 0, len(mergeByID))
for _, def := range mergeByID {
all = append(all, def)
}

return all
}

Expand Down Expand Up @@ -238,15 +237,14 @@ func createFilter(fr filters.Registry, def *eskip.Filter, cpm map[string]Predica
// creates filter instances based on their definition
// and the filter registry.
func createFilters(fr filters.Registry, defs []*eskip.Filter, cpm map[string]PredicateSpec) ([]*RouteFilter, error) {
var fs []*RouteFilter
fs := make([]*RouteFilter, 0, len(defs))
for i, def := range defs {
f, err := createFilter(fr, def, cpm)
if err != nil {
return nil, err
}
fs = append(fs, &RouteFilter{f, def.Name, i})
}

return fs, nil
}

Expand All @@ -272,16 +270,14 @@ func getFreeStringArgs(count int, p *eskip.Predicate) ([]string, error) {
)
}

var a []string
a := make([]string, 0, len(p.Args))
for i := range p.Args {
s, ok := p.Args[i].(string)
if !ok {
return nil, fmt.Errorf("expected argument of type string, %s", p.Name)
}

a = append(a, s)
}

return a, nil
}

Expand Down
3 changes: 1 addition & 2 deletions routing/testdataclient/dataclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,10 @@ func (c *Client) LoadAll() ([]*eskip.Route, error) {
return nil, errors.New("failed to get routes")
}

var routes []*eskip.Route
routes := make([]*eskip.Route, 0, len(c.routes))
for _, r := range c.routes {
routes = append(routes, r)
}

return routes, nil
}

Expand Down

0 comments on commit 2239849

Please sign in to comment.