Skip to content

Commit 00a1171

Browse files
database64128database64128
committed
🦜 Upgrade to Go 1.21
- Remove packages copied from std and change references. - Move functions in [maps] that were dropped by std right before release to maphelper. golang/go#61538 - Use min, max.
1 parent 5eccd51 commit 00a1171

24 files changed

+75
-1941
lines changed

‎cmp/cmp.go

-59
This file was deleted.

‎cmp/cmp_test.go

-96
This file was deleted.

‎cred/manager.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ package cred
22

33
import (
44
"bytes"
5+
"cmp"
56
"context"
67
"encoding/json"
78
"errors"
89
"fmt"
10+
"maps"
911
"os"
12+
"slices"
1013
"strings"
1114
"sync"
1215
"time"
1316
"unsafe"
1417

15-
"github.com/database64128/shadowsocks-go/cmp"
16-
"github.com/database64128/shadowsocks-go/maps"
1718
"github.com/database64128/shadowsocks-go/mmap"
18-
"github.com/database64128/shadowsocks-go/slices"
1919
"github.com/database64128/shadowsocks-go/ss2022"
2020
"go.uber.org/zap"
2121
)

‎dns/dns.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"net"
1010
"net/netip"
1111
"os"
12+
"slices"
1213
"sync"
1314
"time"
1415

1516
"github.com/database64128/shadowsocks-go/conn"
16-
"github.com/database64128/shadowsocks-go/slices"
1717
"github.com/database64128/shadowsocks-go/zerocopy"
1818
"go.uber.org/zap"
1919
"golang.org/x/net/dns/dnsmessage"

‎domainset/matcher_domain.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package domainset
22

33
import (
4-
"github.com/database64128/shadowsocks-go/maps"
5-
"github.com/database64128/shadowsocks-go/slices"
4+
"slices"
5+
6+
"github.com/database64128/shadowsocks-go/maphelper"
67
)
78

89
// MaxLinearDomains is the maximum number of domain rules under which a linear matcher can outperform a map matcher.
@@ -144,7 +145,7 @@ func (dmm DomainMapMatcher) Insert(rule string) {
144145

145146
// Rules implements the MatcherBuilder Rules method.
146147
func (dmm DomainMapMatcher) Rules() []string {
147-
return maps.Keys(dmm)
148+
return maphelper.Keys(dmm)
148149
}
149150

150151
// MatcherCount implements the MatcherBuilder MatcherCount method.
@@ -164,7 +165,7 @@ func (dmmp *DomainMapMatcher) AppendTo(matchers []Matcher) ([]Matcher, error) {
164165
}
165166

166167
if len(dmm) <= MaxLinearDomains {
167-
dlm := DomainLinearMatcher(maps.Keys(dmm))
168+
dlm := DomainLinearMatcher(maphelper.Keys(dmm))
168169
return dlm.AppendTo(matchers)
169170
}
170171

‎domainset/matcher_suffix.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package domainset
22

3-
import "github.com/database64128/shadowsocks-go/maps"
3+
import "github.com/database64128/shadowsocks-go/maphelper"
44

55
// MaxLinearSuffixes is the maximum number of suffix rules under which a linear matcher can outperform a trie matcher.
66
const MaxLinearSuffixes = 4
@@ -102,7 +102,7 @@ func (smm SuffixMapMatcher) Insert(rule string) {
102102

103103
// Rules implements the MatcherBuilder Rules method.
104104
func (smm SuffixMapMatcher) Rules() []string {
105-
return maps.Keys(smm)
105+
return maphelper.Keys(smm)
106106
}
107107

108108
// MatcherCount implements the MatcherBuilder MatcherCount method.
@@ -122,7 +122,7 @@ func (smmp *SuffixMapMatcher) AppendTo(matchers []Matcher) ([]Matcher, error) {
122122
}
123123

124124
if len(smm) <= MaxLinearSuffixes {
125-
slm := SuffixLinearMatcher(maps.Keys(smm))
125+
slm := SuffixLinearMatcher(maphelper.Keys(smm))
126126
return slm.AppendTo(matchers)
127127
}
128128

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/database64128/shadowsocks-go
22

3-
go 1.20
3+
go 1.21.0
44

55
require (
6-
github.com/database64128/tfo-go/v2 v2.0.6
6+
github.com/database64128/tfo-go/v2 v2.1.0
77
github.com/gofiber/contrib/fiberzap/v2 v2.0.0
88
github.com/gofiber/fiber/v2 v2.48.0
99
github.com/oschwald/geoip2-golang v1.9.0

‎go.sum

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
22
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
33
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
4-
github.com/database64128/tfo-go/v2 v2.0.6 h1:gA2SFhSl86g4Xg3aCxoq48VSrKoLhR07SZFFS8q3lfA=
5-
github.com/database64128/tfo-go/v2 v2.0.6/go.mod h1:50S8TP6k6okfwUv1vKFqFoF9AiP2w45Ej5psJm53/oc=
4+
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
5+
github.com/database64128/tfo-go/v2 v2.1.0 h1:t7cECxAPlqTnRJkBxaT4Pu/h6qvCrWpQuQfR10SHb0I=
6+
github.com/database64128/tfo-go/v2 v2.1.0/go.mod h1:AnIPegFUu6WMEPWfWfSyP1Iu41l2AiX/oXBE8/sRG/c=
67
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
79
github.com/gofiber/contrib/fiberzap/v2 v2.0.0 h1:pgFhveNyFlNzr8AQlRG7o1/EKMi+vOmX7RzBfPVgyyc=
810
github.com/gofiber/contrib/fiberzap/v2 v2.0.0/go.mod h1:NUXSG7SUq6b5NQfAyWCEdaaq3ZKsWz6atunN+NJ4gYY=
911
github.com/gofiber/fiber/v2 v2.48.0 h1:cRVMCb9aUJDsyHxGFLwz/sGzDggdailZZyptU9F9cU0=
@@ -26,17 +28,20 @@ github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOM
2628
github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
2729
github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
2830
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
31+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2932
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
3033
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
3134
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
3235
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
36+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
3337
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
3438
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
3539
github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc=
3640
github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
3741
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
3842
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
3943
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
44+
go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
4045
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
4146
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
4247
go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
@@ -51,5 +56,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5156
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
5257
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5358
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
59+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5460
lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
5561
lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

‎maphelper/maphelper.go

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package maphelper
2+
3+
// Keys returns the keys of the map m.
4+
// The keys will be in an indeterminate order.
5+
func Keys[M ~map[K]V, K comparable, V any](m M) []K {
6+
r := make([]K, 0, len(m))
7+
for k := range m {
8+
r = append(r, k)
9+
}
10+
return r
11+
}
12+
13+
// Values returns the values of the map m.
14+
// The values will be in an indeterminate order.
15+
func Values[M ~map[K]V, K comparable, V any](m M) []V {
16+
r := make([]V, 0, len(m))
17+
for _, v := range m {
18+
r = append(r, v)
19+
}
20+
return r
21+
}

‎maps/maps.go

-42
This file was deleted.

‎portset/portset_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package portset
22

33
import (
4+
"slices"
45
"strconv"
56
"testing"
6-
7-
"github.com/database64128/shadowsocks-go/slices"
87
)
98

109
func assertPanic(t *testing.T, f func()) {

‎router/route.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
"errors"
66
"fmt"
77
"net/netip"
8+
"slices"
89

910
"github.com/database64128/shadowsocks-go/bitset"
1011
"github.com/database64128/shadowsocks-go/conn"
1112
"github.com/database64128/shadowsocks-go/dns"
1213
"github.com/database64128/shadowsocks-go/domainset"
1314
"github.com/database64128/shadowsocks-go/portset"
14-
"github.com/database64128/shadowsocks-go/slices"
1515
"github.com/database64128/shadowsocks-go/zerocopy"
1616
"github.com/oschwald/geoip2-golang"
1717
"go.uber.org/zap"

0 commit comments

Comments
 (0)