Skip to content

Commit cd39efa

Browse files
committed
all: use slices.Sort() to sort strings
1 parent df9623d commit cd39efa

File tree

18 files changed

+39
-40
lines changed

18 files changed

+39
-40
lines changed

accounts/abi/abigen/bindv2.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"reflect"
2424
"regexp"
2525
"slices"
26-
"sort"
2726
"strings"
2827
"text/template"
2928
"unicode"
@@ -280,7 +279,7 @@ func iterSorted[V any](inp map[string]V, onItem func(string, V) error) error {
280279
for key := range inp {
281280
sortedKeys = append(sortedKeys, key)
282281
}
283-
sort.Strings(sortedKeys)
282+
slices.Sort(sortedKeys)
284283

285284
for _, key := range sortedKeys {
286285
if err := onItem(key, inp[key]); err != nil {

cmd/puppeth/wizard.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"net"
2525
"os"
2626
"path/filepath"
27-
"sort"
27+
"slices"
2828
"strconv"
2929
"strings"
3030
"sync"
@@ -53,7 +53,7 @@ func (c config) servers() []string {
5353
for server := range c.Servers {
5454
servers = append(servers, server)
5555
}
56-
sort.Strings(servers)
56+
slices.Sort(servers)
5757

5858
return servers
5959
}

cmd/puppeth/wizard_ethstats.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package main
1818

1919
import (
2020
"fmt"
21-
"sort"
21+
"slices"
2222

2323
"github.com/XinFinOrg/XDPoSChain/log"
2424
)
@@ -98,7 +98,7 @@ func (w *wizard) deployEthstats() {
9898
}
9999
break
100100
}
101-
sort.Strings(infos.banned)
101+
slices.Sort(infos.banned)
102102
}
103103
}
104104
// Try to deploy the ethstats server on the host

cmd/puppeth/wizard_netstats.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"encoding/json"
2121
"os"
22-
"sort"
22+
"slices"
2323
"strings"
2424
"sync"
2525

@@ -226,7 +226,7 @@ func (stats serverStats) render() {
226226
for server := range stats {
227227
servers = append(servers, server)
228228
}
229-
sort.Strings(servers)
229+
slices.Sort(servers)
230230

231231
for i, server := range servers {
232232
// Add a separator between all servers
@@ -238,7 +238,7 @@ func (stats serverStats) render() {
238238
for service := range stats[server].services {
239239
services = append(services, service)
240240
}
241-
sort.Strings(services)
241+
slices.Sort(services)
242242

243243
if len(services) == 0 {
244244
table.Append([]string{server, stats[server].address, "", "", ""})
@@ -253,7 +253,7 @@ func (stats serverStats) render() {
253253
for service := range stats[server].services[service] {
254254
configs = append(configs, service)
255255
}
256-
sort.Strings(configs)
256+
slices.Sort(configs)
257257

258258
for k, config := range configs {
259259
switch {

console/console.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"os/signal"
2525
"path/filepath"
2626
"regexp"
27-
"sort"
27+
"slices"
2828
"strings"
2929
"sync"
3030
"syscall"
@@ -317,7 +317,7 @@ func (c *Console) Welcome() {
317317
for api, version := range apis {
318318
modules = append(modules, fmt.Sprintf("%s:%s", api, version))
319319
}
320-
sort.Strings(modules)
320+
slices.Sort(modules)
321321
message += " modules: " + strings.Join(modules, " ") + "\n"
322322
}
323323
message += "\nTo exit, press ctrl-d or type exit"

ethdb/dbtest/testsuite.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package dbtest
1919
import (
2020
"bytes"
2121
"reflect"
22-
"sort"
22+
"slices"
2323
"testing"
2424

2525
"github.com/XinFinOrg/XDPoSChain/ethdb"
@@ -133,7 +133,7 @@ func TestDatabaseSuite(t *testing.T, New func() ethdb.KeyValueStore) {
133133
defer db.Close()
134134

135135
keys := []string{"1", "2", "3", "4", "6", "10", "11", "12", "20", "21", "22"}
136-
sort.Strings(keys) // 1, 10, 11, etc
136+
slices.Sort(keys) // 1, 10, 11, etc
137137

138138
for _, k := range keys {
139139
if err := db.Put([]byte(k), nil); err != nil {
@@ -319,7 +319,7 @@ func iterateKeys(it ethdb.Iterator) []string {
319319
for it.Next() {
320320
keys = append(keys, string(it.Key()))
321321
}
322-
sort.Strings(keys)
322+
slices.Sort(keys)
323323
it.Release()
324324
return keys
325325
}

ethdb/memorydb/memorydb.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package memorydb
1919

2020
import (
2121
"errors"
22-
"sort"
22+
"slices"
2323
"strings"
2424
"sync"
2525

@@ -160,7 +160,7 @@ func (db *Database) NewIterator(prefix []byte, start []byte) ethdb.Iterator {
160160
}
161161
}
162162
// Sort the items and retrieve the associated values
163-
sort.Strings(keys)
163+
slices.Sort(keys)
164164
for _, key := range keys {
165165
values = append(values, db.db[key])
166166
}

internal/build/file.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"io"
2222
"os"
2323
"path/filepath"
24-
"sort"
24+
"slices"
2525
"strings"
2626
)
2727

@@ -97,6 +97,6 @@ func DiffHashes(a map[string][32]byte, b map[string][32]byte) []string {
9797
updates = append(updates, file)
9898
}
9999
}
100-
sort.Strings(updates)
100+
slices.Sort(updates)
101101
return updates
102102
}

internal/flags/helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"os"
2222
"regexp"
23-
"sort"
23+
"slices"
2424
"strings"
2525

2626
"github.com/XinFinOrg/XDPoSChain/log"
@@ -276,7 +276,7 @@ func CheckEnvVars(ctx *cli.Context, flags []cli.Flag, prefix string) {
276276
}
277277
}
278278
keyvals := os.Environ()
279-
sort.Strings(keyvals)
279+
slices.Sort(keyvals)
280280

281281
for _, keyval := range keyvals {
282282
key := strings.Split(keyval, "=")[0]

internal/jsre/completion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package jsre
1818

1919
import (
2020
"regexp"
21-
"sort"
21+
"slices"
2222
"strings"
2323

2424
"github.com/dop251/goja"
@@ -88,6 +88,6 @@ func getCompletions(vm *goja.Runtime, line string) (results []string) {
8888
}
8989
}
9090

91-
sort.Strings(results)
91+
slices.Sort(results)
9292
return results
9393
}

0 commit comments

Comments
 (0)