Skip to content

Commit de726e1

Browse files
committed
Run go modernize
1 parent c887662 commit de726e1

File tree

20 files changed

+571
-594
lines changed

20 files changed

+571
-594
lines changed

modules/aql/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func init() {
9393
}
9494

9595
resulttypes := make(map[string]int)
96-
for i := 0; i < 256; i++ {
96+
for i := range 256 {
9797
if objecttypes[i] > 0 {
9898
resulttypes[engine.NodeType(i).String()] = objecttypes[i]
9999
}

modules/aql/aqlqueryhelpers.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ func (pq *PriorityQueue) Pop() searchState {
8787
pq.siftDown(0)
8888

8989
if len(pq.items) <= cap(pq.items)/4 {
90-
newCap := cap(pq.items) / 2
91-
if newCap < 1 {
92-
newCap = 1
93-
}
90+
newCap := max(cap(pq.items)/2, 1)
9491
newItems := make([]searchState, len(pq.items), newCap)
9592
copy(newItems, pq.items)
9693
pq.items = newItems

modules/basedata/basedata_gen_test.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/engine/attributevalue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (avs AttributeValues) Iterate(it func(val AttributeValue) bool) {
6868

6969
func (avs AttributeValues) StringSlice() []string {
7070
result := make([]string, len(avs))
71-
for i := 0; i < len(avs); i++ {
71+
for i := range avs {
7272
result[i] = avs[i].String()
7373
}
7474
return result

modules/engine/attributevaluemap.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ func (avm *AttributesAndValues) Merge(avm2 *AttributesAndValues) *AttributesAndV
3434
merged.init()
3535

3636
// pre-allocate backing array for values to avoid repeated reallocations
37-
longestlen := len(avm.values)
38-
if len(avm2.values) > longestlen {
39-
longestlen = len(avm2.values)
40-
}
37+
longestlen := max(len(avm2.values), len(avm.values))
4138
merged.values = make(AttributeValues, 0, longestlen)
4239

4340
// Collect keys directly from both maps (avoids extra Iterate/map lookups).

modules/engine/edge.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (eb EdgeBitmap) ToStringSlice() []string {
8585
}
8686

8787
func (eb EdgeBitmap) Range(f func(e Edge) bool) {
88-
for index := 0; index < MAXEDGEPOSSIBLE; index++ {
88+
for index := range MAXEDGEPOSSIBLE {
8989
if eb.IsSet(Edge(index)) {
9090
if !f(Edge(index)) {
9191
return
@@ -400,7 +400,7 @@ var AllEdgesBitmap EdgeBitmap
400400
var EdgePopularity [MAXEDGEPOSSIBLE]uint64
401401

402402
func init() {
403-
for i := Edge(0); i < MAXEDGEPOSSIBLE; i++ {
403+
for i := range Edge(MAXEDGEPOSSIBLE) {
404404
AllEdgesBitmap = AllEdgesBitmap.set(i)
405405
}
406406
}

0 commit comments

Comments
 (0)